diff --git a/puppet-augeas.spec b/puppet-augeas.spec index f63d5ba4d65a9a7dd89db2770002251f2a97e557..ba68bf19378ea760c0c2bf340736ab7a6916c6cd 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 0000000000000000000000000000000000000000..ed97d539c095cf1413af30cc23dea272095b97dd --- /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 4101684f3447c0fe4882ec3d9eb11cadf8750034..4a008f416237fbcd7e07c1e91480c9aee3a901f7 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)