Attachment 933502 Details for Bug 1136040 – Naive patch

[patch] Naive patch

patch (text/plain), 1.59 KB, created by Miroslav Suchý on 2014-09-01 18:49:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miroslav Suchý

Created: 2014-09-01 18:49:13 UTC

Size: 1.59 KB

patch

obsolete

>diff --git a/py/mockbuild/buildroot.py b/py/mockbuild/buildroot.py
>index f248888..33284b5 100644
>--- a/py/mockbuild/buildroot.py
>+++ b/py/mockbuild/buildroot.py
>@@ -132,6 +132,7 @@ class Buildroot(object):
>             self._init_aux_files()
>             self._setup_timezone()
>             self._init_pkg_management()
>+            self._setup_timezone_symlink()
>             self._make_build_user()
>             self._setup_build_dirs()
>         elif prebuild:
>@@ -160,12 +161,17 @@ class Buildroot(object):
>                                  env=self.env, shell=shell, *args, **kargs)
> 
>     @traceLog()
>-    def _copy_config(self, filename):
>+    def _copy_config(self, filename, readlink=False):
>         etcdir = self.make_chroot_path('etc')
>+        conf_file_orig = os.path.join('etc', filename)
>         conf_file = os.path.join(etcdir, filename)
>         if os.path.exists(conf_file):
>             os.remove(conf_file)
>-        shutil.copy2(os.path.join('/etc', filename), etcdir)
>+        if readlink and os.path.islink(conf_file_orig):
>+            linkto = os.readlink(src)
>+            os.symlink(linkto, conf_file)
>+        else:
>+            shutil.copy2(os.path.join('/etc', filename), etcdir)
> 
>     @traceLog()
>     def _setup_resolver_config(self):
>@@ -190,6 +196,10 @@ class Buildroot(object):
>         self._copy_config('localtime')
> 
>     @traceLog()
>+    def _setup_timezone_symlink(self):
>+        self._copy_config('localtime', readlink=True)
>+
>+    @traceLog()
>     def _init_pkg_management(self):
>         update_state = '{0} update'.format(self.pkg_manager.command)
>         self.state.start(update_state)

Actions: View | Diff

Attachments on bug 1136040: 933502