diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-01-14 14:10:02 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2021-01-14 14:36:31 +0100 |
| commit | 764b7125df272d2c5e93fe7a06e2d34446f39881 (patch) | |
| tree | 5355298427eb764e0ae526a5e8ebe4d520abbfa6 /node-admin | |
| parent | 4786e790d95bf80b96d8442ef4949235cd5b7f2a (diff) | |
Skip --quiet with Yum 4
Diffstat (limited to 'node-admin')
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java | 11 | ||||
| -rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java index 3ff960d88e2..9fba22a239f 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java @@ -148,9 +148,18 @@ public abstract class YumCommand<T extends YumCommand<T>> { Version yumVersion = version(context); String targetVersionLockName = yumPackage.toVersionLockName(yumVersion); + List<String> command = new ArrayList<>(4); + command.add("yum"); + // Using --quiet on Yum 4 always results in an empty list, even if locks exist... + if (yumVersion.getMajor() < 4) { + command.add("--quiet"); + } + command.add("versionlock"); + command.add("list"); + boolean alreadyLocked = terminal .newCommandLine(context) - .add("yum", "--quiet", "versionlock", "list") + .add(command) .executeSilently() .getOutputLinesStream() .map(YumPackageName::parseString) diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java index a66fc0cceab..3ec2bc9c570 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java @@ -192,7 +192,7 @@ public class YumTest { @Test public void testWithVersionLockYum4() { mockYumVersion(YumVersion.rhel8); - terminal.expectCommand("yum --quiet versionlock list 2>&1", + terminal.expectCommand("yum versionlock list 2>&1", 0, "Last metadata expiration check: 0:51:26 ago on Thu 14 Jan 2021 09:39:24 AM UTC.\n"); terminal.expectCommand("yum versionlock add --assumeyes \"openssh-0:8.0p1-4.el8_1.*\" 2>&1"); |