diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-01-14 14:31:33 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2021-01-14 14:36:31 +0100 |
| commit | 8e5dcd0c5885d3257cf0f368bd2a39e125ecf7ec (patch) | |
| tree | fed93b6d9661648a7541ff3956fed5ec55cfc996 /node-admin/src/main/java/com/yahoo/vespa/hosted | |
| parent | e12dec3f2b49526c5b24b01c9c79739ffdca109a (diff) | |
Remove duplicated and stale pattern
Diffstat (limited to 'node-admin/src/main/java/com/yahoo/vespa/hosted')
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/Yum.java | 7 | ||||
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java | 3 |
2 files changed, 4 insertions, 6 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 7228741b779..482f324a9b5 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 @@ -22,10 +22,9 @@ import static com.yahoo.vespa.hosted.node.admin.task.util.yum.YumCommand.Install public class Yum { // Note: "(?dm)" makes newline be \n (only), and enables multiline mode where ^$ match lines with find() - private static final Pattern INSTALL_NOOP_PATTERN = Pattern.compile("(?dm)^Nothing to do\\.?$"); - private static final Pattern UPGRADE_NOOP_PATTERN = Pattern.compile("(?dm)^No packages marked for update$"); - private static final Pattern REMOVE_NOOP_PATTERN = Pattern.compile("(?dm)^No [pP]ackages marked for removal\\.?$"); - + public static final Pattern INSTALL_NOOP_PATTERN = Pattern.compile("(?dm)^Nothing to do\\.?$"); + public static final Pattern UPGRADE_NOOP_PATTERN = Pattern.compile("(?dm)^No packages marked for update$"); + public static final Pattern REMOVE_NOOP_PATTERN = Pattern.compile("(?dm)^No [pP]ackages marked for removal\\.?$"); // WARNING: These must be in the same order as the supplier below private static final String RPM_QUERYFORMAT = Stream.of("NAME", "EPOCH", "VERSION", "RELEASE", "ARCH") 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 9fba22a239f..f7ca453256f 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 @@ -132,7 +132,6 @@ public abstract class YumCommand<T extends YumCommand<T>> { // Note: "(?dm)" makes newline be \n (only), and enables multiline mode where ^$ match lines with find() private static final Pattern CHECKING_FOR_UPDATE_PATTERN = Pattern.compile("(?dm)^Package matching [^ ]+ already installed\\. Checking for update\\.$"); - private static final Pattern NOTHING_TO_DO_PATTERN = Pattern.compile("(?dm)^Nothing to do$"); private final Terminal terminal; private final YumPackageName yumPackage; @@ -212,7 +211,7 @@ public abstract class YumCommand<T extends YumCommand<T>> { String output = installCommand.executeSilently().getUntrimmedOutput(); - if (NOTHING_TO_DO_PATTERN.matcher(output).find()) { + if (Yum.INSTALL_NOOP_PATTERN.matcher(output).find()) { if (CHECKING_FOR_UPDATE_PATTERN.matcher(output).find()) { // case 3. var upgradeCommand = terminal.newCommandLine(context).add("yum", "downgrade"); |