Skip to content

Commit 83d06f3

Browse files
committed
Provide puppet-agent on RPM and Debian
This allows users to perform `dnf install puppet-agent` or `apt install puppet-agent` and get openvox-agent instead. It also means packages don't need to modify their dependencies. They probably still should, but this helps users migrate. It also tightens the Obsoletes statement to include the major version. rpmlint raises the unversioned-explicit-obsoletes warning on the old case. The Conflicts is kept unversioned, which is correct.
1 parent df48c1a commit 83d06f3

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

configs/projects/openvox-agent.rb

+6-1
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,13 @@
176176
end
177177

178178
# make sure we can replace puppet-agent in place for the rename
179-
proj.replaces 'puppet-agent'
179+
proj.replaces 'puppet-agent', "< #{major.to_i + 1}"
180180
proj.conflicts 'puppet-agent'
181+
if platform.is_rpm?
182+
proj.provides 'puppet-agent', "= #{major}"
183+
elsif platform.is_deb?
184+
proj.provides 'puppet-agent', "(= #{major})"
185+
end
181186

182187
proj.timeout 7200 if platform.is_windows?
183188
end

0 commit comments

Comments
 (0)