From 83bd70956225495152646cef90a5f64dadbb7996 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 22 Sep 2022 12:36:55 -0700 Subject: [PATCH] Revert "zulip-puppet-apply: Work around broken Puppet on Ubuntu 22.04." This reverts commit 25c87cc7da800f6d314f34708cf6cf4720fcdd68 (#21328). This upstream Ubuntu bug was fixed. Signed-off-by: Anders Kaseorg --- scripts/lib/ruby3hack.rb | 7 ------- scripts/zulip-puppet-apply | 2 -- 2 files changed, 9 deletions(-) delete mode 100644 scripts/lib/ruby3hack.rb diff --git a/scripts/lib/ruby3hack.rb b/scripts/lib/ruby3hack.rb deleted file mode 100644 index 7b78b52706..0000000000 --- a/scripts/lib/ruby3hack.rb +++ /dev/null @@ -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 diff --git a/scripts/zulip-puppet-apply b/scripts/zulip-puppet-apply index 104dd5657e..a1ffc356d5 100755 --- a/scripts/zulip-puppet-apply +++ b/scripts/zulip-puppet-apply @@ -66,8 +66,6 @@ puppet_env["FACTER_zulip_scripts_path"] = scripts_path # This is to suppress Puppet warnings with ruby 2.7. if (distro_info["ID"], distro_info["VERSION_ID"]) in [("ubuntu", "20.04")]: 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: