diff options
| author |   Zhang Zongyu <zzy2529420793@gmail.com> | 2020-08-28 12:09:53 +0800 |
|---|---|---|
| committer | Zhang Zongyu <zzy2529420793@gmail.com> | 2020-08-30 23:12:07 +0800 |
| commit | 2fc8f0371559d97e28265bc422d9114d42cf61cf (patch) | |
| tree | 5171cb4535c427c68a80776ac8a25c1530c6b5d7 | |
| parent | release 0.5.0 (diff) | |
| download | java-ebuilder-2fc8f0371559d97e28265bc422d9114d42cf61cf.tar.gz java-ebuilder-2fc8f0371559d97e28265bc422d9114d42cf61cf.tar.bz2 java-ebuilder-2fc8f0371559d97e28265bc422d9114d42cf61cf.zip | |
reduce useless output of `movl`
Signed-off-by: Zhang Zongyu <zzy2529420793@gmail.com>
| -rwxr-xr-x | scripts/bin/compare-maven-version | 4 | ||||
| -rwxr-xr-x | scripts/bin/tree.sh | 2 | ||||
| -rw-r--r-- | src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/scripts/bin/compare-maven-version b/scripts/bin/compare-maven-version index de0ab47..f98a6c7 100755 --- a/scripts/bin/compare-maven-version +++ b/scripts/bin/compare-maven-version @@ -94,8 +94,8 @@ parser.add_argument('--maven-version', dest='mv', action='store', if __name__ == "__main__": args = parser.parse_args() - dep = MavenVersion.MavenVersion(args.dep) - mv = MavenVersion.MavenSingleVersion(args.mv) + dep = MavenVersion(args.dep) + mv = MavenSingleVersion(args.mv) if dep.max.version[0] != 99999999: print(f"SLOT={dep.min.version[0]}.{dep.min.version[1]}") diff --git a/scripts/bin/tree.sh b/scripts/bin/tree.sh index 69dfbd6..5cec2c7 100755 --- a/scripts/bin/tree.sh +++ b/scripts/bin/tree.sh @@ -82,7 +82,7 @@ get_maven() { MV=$(xmllint --xpath "/metadata/versioning/versions/version/text()"\ "${ARTIFACT_METADATA}"\ | awk "NR==${line_number}{print $1}") - if compare-maven-version 2>&1 1>/dev/null; then + if compare-maven-version -h 2>/dev/null 1>/dev/null; then TMP_SLOT=$(compare-maven-version --dep "${MV_RANGE}" --maven-version ${MV}) || continue fi eval $TMP_SLOT diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java index 6e0e447..f69527f 100644 --- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java +++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java @@ -133,7 +133,8 @@ public class MavenParser { xmlProcess = xmlBuilder.start(); xmlProcess.waitFor(10, TimeUnit.MINUTES); } catch (final IOException | InterruptedException ex) { - config.getStdoutWriter().println('\n' + ex.toString()); + config.getStdoutWriter().print(""); + //config.getStdoutWriter().println('\n' + ex.toString()); } if (process.exitValue() != 0) { |