diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2020-03-13 10:54:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-13 10:54:15 +0100 |
commit | c1171553c35d7414367777d5daed8a2b851d661e (patch) | |
tree | 8c8bf3af3d2829bae9ad6cef77aabaf99e7ea372 | |
parent | e66da93c63858a0bfa60647eb0de645d7f0ce7b6 (diff) | |
parent | d13563ae08f3aa92c3c0f6661989328093bb060d (diff) |
Merge pull request #12557 from vespa-engine/freva/remove-ibd2
Allow installing/upgrading/removing packages given as list
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java index 85a7c065a86..a4138b215c4 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java @@ -143,6 +143,7 @@ public class Yum { return modified; } + public GenericYumCommand install(YumPackageName... packages) { return newYumCommand("install", packages, INSTALL_NOOP_PATTERN); } @@ -151,6 +152,11 @@ public class Yum { return install(toYumPackageNameArray(package1, packages)); } + public GenericYumCommand install(List<String> packages) { + return install(packages.stream().map(YumPackageName::fromString).toArray(YumPackageName[]::new)); + } + + public GenericYumCommand upgrade(YumPackageName... packages) { return newYumCommand("upgrade", packages, UPGRADE_NOOP_PATTERN); } @@ -159,6 +165,11 @@ public class Yum { return upgrade(toYumPackageNameArray(package1, packages)); } + public GenericYumCommand upgrade(List<String> packages) { + return upgrade(packages.stream().map(YumPackageName::fromString).toArray(YumPackageName[]::new)); + } + + public GenericYumCommand remove(YumPackageName... packages) { return newYumCommand("remove", packages, REMOVE_NOOP_PATTERN); } @@ -167,6 +178,10 @@ public class Yum { return remove(toYumPackageNameArray(package1, packages)); } + public GenericYumCommand remove(List<String> packages) { + return remove(packages.stream().map(YumPackageName::fromString).toArray(YumPackageName[]::new)); + } + static YumPackageName[] toYumPackageNameArray(String package1, String... packages) { YumPackageName[] array = new YumPackageName[1 + packages.length]; array[0] = YumPackageName.fromString(package1); @@ -176,14 +191,9 @@ public class Yum { return array; } - private GenericYumCommand newYumCommand(String yumCommand, - YumPackageName[] packages, - Pattern noopPattern) { - return new GenericYumCommand( - terminal, - yumCommand, - List.of(packages), - noopPattern); + + private GenericYumCommand newYumCommand(String yumCommand, YumPackageName[] packages, Pattern noopPattern) { + return new GenericYumCommand(terminal, yumCommand, List.of(packages), noopPattern); } public static class GenericYumCommand { |