paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "zulip-puppet-apply: Work around broken Puppet on Ubuntu 22.04."

Browse Source 
This reverts commit 25c87cc7da (#21328).

This upstream Ubuntu bug was fixed.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2022-09-22 12:36:55 -07:00
committed by Tim Abbott
parent a359362845
commit 83bd709562
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/lib/ruby3hack.rb
View File

@@ -1,7 +0,0 @@
# Work around https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1969939.
require 'fileutils'
def FileUtils.symlink(src, dest, options = {}, **kwargs)
FileUtils.ln_s(src, dest, **options, **kwargs)
end

2
scripts/zulip-puppet-apply
View File

@@ -66,8 +66,6 @@ puppet_env["FACTER_zulip_scripts_path"] = scripts_path
# This is to suppress Puppet warnings with ruby 2.7. # This is to suppress Puppet warnings with ruby 2.7.
if (distro_info["ID"], distro_info["VERSION_ID"]) in [("ubuntu", "20.04")]: if (distro_info["ID"], distro_info["VERSION_ID"]) in [("ubuntu", "20.04")]:
puppet_env["RUBYOPT"] = "-W0" puppet_env["RUBYOPT"] = "-W0"
if (distro_info["ID"], distro_info["VERSION_ID"]) in [("ubuntu", "22.04")]:
puppet_env["RUBYOPT"] = "-r " + os.path.join(scripts_path, "lib", "ruby3hack.rb")
def noop_would_change(puppet_cmd: List[str]) -> bool: def noop_would_change(puppet_cmd: List[str]) -> bool: