diff --git a/.gitignore b/.gitignore index 4339b18..5b0245f 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /4c557b47a3abd7d637f5674febfd6589877c85cd.tar.gz /840732d9b858ca998a3e61d3821ecbd260895a84.tar.gz /3f39c11df56fc08004a75776899a08a18dbe6490.tar.gz +/436cf5db54fa72f90694f9c64aa7c8d72328299e.tar.gz diff --git a/fix_syscontainer_prefix.patch b/fix_syscontainer_prefix.patch deleted file mode 100644 index 5b8740f..0000000 --- a/fix_syscontainer_prefix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 627e236a6e6554c2c4f95ae2c257a278fbf7c143 Mon Sep 17 00:00:00 2001 -From: Brent Baude -Date: Mon, 19 Jun 2017 14:23:07 -0500 -Subject: [PATCH] Atomic/systemcontainers.py: Set prefix to "/" if None - -In the case of installing a systemcontainer, if using python3 and the -prefix ends up being None, it throws a traceback as reported in -bz #1461994. Using prefix or "/" fixes this issue. ---- - Atomic/syscontainers.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Atomic/syscontainers.py b/Atomic/syscontainers.py -index b3906d51..f0773f50 100644 ---- a/Atomic/syscontainers.py -+++ b/Atomic/syscontainers.py -@@ -814,10 +814,10 @@ def _do_checkout(self, repo, name, img, upgrade, deployment, values, destination - - if has_container_service: - util.write_template(unitfile, systemd_template, values, unitfileout) -- shutil.copyfile(unitfileout, os.path.join(prefix, destination, "%s.service" % name)) -+ shutil.copyfile(unitfileout, os.path.join(prefix or "/", destination, "%s.service" % name)) - if (tmpfiles_template): - util.write_template(unitfile, tmpfiles_template, values, tmpfilesout) -- shutil.copyfile(tmpfilesout, os.path.join(prefix, destination, "tmpfiles-%s.conf" % name)) -+ shutil.copyfile(tmpfilesout, os.path.join(prefix or "/", destination, "tmpfiles-%s.conf" % name)) - - if not prefix: - sym = "%s/%s" % (self._get_system_checkout_path(), name) diff --git a/sources b/sources index b7a1211..4730a33 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (3f39c11df56fc08004a75776899a08a18dbe6490.tar.gz) = 76aab5bf04dcd6ea52ac1405121d32ca5859c344a87c715b4f713563143227734df26ed6601592a56741c1ba030b8667d9d0b45ac7cc1bbd5e02f27f6387f04e -SHA512 (840732d9b858ca998a3e61d3821ecbd260895a84.tar.gz) = 1fb0293e5fb8773fcfca3453164e37a4bb2cdc14644c94a035dd5d8f0bb6d82b6fe16e16795e46dcb0784efeab255f6aa6bbacb440e5a8dc6907df23e65cde04 +SHA512 (436cf5db54fa72f90694f9c64aa7c8d72328299e.tar.gz) = cbe4139c7c731e5702c53e412a8060b5d9500c9476639022ce9b20297f1884e288d4735a3679780504087d5eb355afef3189e32345c83fe95d922d08db398ac9