From 8dfee54693751313748e2e50738c7af0fd850342 Mon Sep 17 00:00:00 2001
From: Ben Morrice <ben.morrice@cern.ch>
Date: Fri, 12 Jan 2024 08:22:08 +0100
Subject: [PATCH] Code rebased to #9ac8ab00c86c257825068ab0a86ae7a8e84f1e73 by
 locmap-updater

---
 puppet-augeas.spec         | 5 ++++-
 src/code/data/common.yaml  | 1 +
 src/code/manifests/lens.pp | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 src/code/data/common.yaml

diff --git a/puppet-augeas.spec b/puppet-augeas.spec
index f63d5ba..ba68bf1 100644
--- a/puppet-augeas.spec
+++ b/puppet-augeas.spec
@@ -2,7 +2,7 @@ Autoreq: 0
 
 Name:           puppet-augeas
 Version:        1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Puppetlabs augeas module
 
 Group:          CERN/Utilities
@@ -31,6 +31,9 @@ cp -ra code/* %{buildroot}/%{_datadir}/puppet/modules/augeas/
 %doc code/README.md
 
 %changelog
+* Fri Jan 12 2024 CERN Linux Droid <linux.ci@cern.ch> - 1.0-4
+- Rebased to #9ac8ab00c86c257825068ab0a86ae7a8e84f1e73 by locmap-updater
+
 * Fri Dec 02 2022 Ben Morrice <ben.morrice@cern.ch> 1.0-3
 - Bump release for disttag change
 
diff --git a/src/code/data/common.yaml b/src/code/data/common.yaml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/src/code/data/common.yaml
@@ -0,0 +1 @@
+---
diff --git a/src/code/manifests/lens.pp b/src/code/manifests/lens.pp
index 4101684..4a008f4 100644
--- a/src/code/manifests/lens.pp
+++ b/src/code/manifests/lens.pp
@@ -58,7 +58,7 @@ define augeas::lens (
     mode => '0644',
   }
 
-  if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) {
+  if (!$stock_since or versioncmp($facts['augeas']['version'], $stock_since) < 0) {
 
     assert_type(Pattern[/^\/.*/], $augeas::lens_dir)
 
-- 
GitLab