diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2021-07-30 11:54:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-30 11:54:43 +0200 |
commit | 07232bfdeb634c4940a44117b4db65f644552e96 (patch) | |
tree | bcddf10364e00b707b09bed2549365102ac655a3 /node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java | |
parent | 0ee098ce8f4fa965145849101c28d836a2552f31 (diff) | |
parent | a399a513294c5fe28250565c370b0a51e2fcbf72 (diff) |
Merge pull request #18656 from vespa-engine/freva/default-epoch
Treat epoch (none) as 0
Diffstat (limited to 'node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumCommand.java | 2 |
1 files changed, 2 insertions, 0 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 1d105057e02..1530b3c72f0 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 @@ -260,6 +260,8 @@ public abstract class YumCommand<T extends YumCommand<T>> { if (lines.size() > builders.size()) throw new IllegalArgumentException("Found multiple installed packages for '" + packageName + "'. Version is required to match package exactly"); IntStream.range(0, builders.size()).forEach(i -> lines.get(i).ifPresent(builders.get(i)::apply)); + if (builder.epoch().isEmpty()) builder.setEpoch("0"); + return Optional.of(builder.build()); } } |