| 1 |
commit: 2fc8f0371559d97e28265bc422d9114d42cf61cf |
| 2 |
Author: Zhang Zongyu <zzy2529420793 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Aug 28 04:09:53 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 15:12:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=2fc8f037 |
| 7 |
|
| 8 |
reduce useless output of `movl` |
| 9 |
|
| 10 |
Signed-off-by: Zhang Zongyu <zzy2529420793 <AT> gmail.com> |
| 11 |
|
| 12 |
scripts/bin/compare-maven-version | 4 ++-- |
| 13 |
scripts/bin/tree.sh | 2 +- |
| 14 |
src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java | 3 ++- |
| 15 |
3 files changed, 5 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/scripts/bin/compare-maven-version b/scripts/bin/compare-maven-version |
| 18 |
index de0ab47..f98a6c7 100755 |
| 19 |
--- a/scripts/bin/compare-maven-version |
| 20 |
+++ b/scripts/bin/compare-maven-version |
| 21 |
@@ -94,8 +94,8 @@ parser.add_argument('--maven-version', dest='mv', action='store', |
| 22 |
if __name__ == "__main__": |
| 23 |
args = parser.parse_args() |
| 24 |
|
| 25 |
- dep = MavenVersion.MavenVersion(args.dep) |
| 26 |
- mv = MavenVersion.MavenSingleVersion(args.mv) |
| 27 |
+ dep = MavenVersion(args.dep) |
| 28 |
+ mv = MavenSingleVersion(args.mv) |
| 29 |
|
| 30 |
if dep.max.version[0] != 99999999: |
| 31 |
print(f"SLOT={dep.min.version[0]}.{dep.min.version[1]}") |
| 32 |
|
| 33 |
diff --git a/scripts/bin/tree.sh b/scripts/bin/tree.sh |
| 34 |
index 69dfbd6..5cec2c7 100755 |
| 35 |
--- a/scripts/bin/tree.sh |
| 36 |
+++ b/scripts/bin/tree.sh |
| 37 |
@@ -82,7 +82,7 @@ get_maven() { |
| 38 |
MV=$(xmllint --xpath "/metadata/versioning/versions/version/text()"\ |
| 39 |
"${ARTIFACT_METADATA}"\ |
| 40 |
| awk "NR==${line_number}{print $1}") |
| 41 |
- if compare-maven-version 2>&1 1>/dev/null; then |
| 42 |
+ if compare-maven-version -h 2>/dev/null 1>/dev/null; then |
| 43 |
TMP_SLOT=$(compare-maven-version --dep "${MV_RANGE}" --maven-version ${MV}) || continue |
| 44 |
fi |
| 45 |
eval $TMP_SLOT |
| 46 |
|
| 47 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
| 48 |
index 6e0e447..f69527f 100644 |
| 49 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
| 50 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
| 51 |
@@ -133,7 +133,8 @@ public class MavenParser { |
| 52 |
xmlProcess = xmlBuilder.start(); |
| 53 |
xmlProcess.waitFor(10, TimeUnit.MINUTES); |
| 54 |
} catch (final IOException | InterruptedException ex) { |
| 55 |
- config.getStdoutWriter().println('\n' + ex.toString()); |
| 56 |
+ config.getStdoutWriter().print(""); |
| 57 |
+ //config.getStdoutWriter().println('\n' + ex.toString()); |
| 58 |
} |
| 59 |
|
| 60 |
if (process.exitValue() != 0) { |
Archives