Attachment 587386 Details for Bug 803217 – Configure environment from command line

[patch] Configure environment from command line

mock-env.patch (text/plain), 2.21 KB, created by Max Romanov on 2012-05-29 11:13:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Romanov

Created: 2012-05-29 11:13:52 UTC

Size: 2.21 KB

patch

obsolete

>--- /usr/sbin/mock.orig	2012-05-29 13:26:11.000000000 +0400
>+++ /usr/sbin/mock	2012-05-29 13:38:53.000000000 +0400
>@@ -210,6 +210,10 @@
>                       default=[], type="string",
>                       help="define an SCM option (may be used more than once)")
> 
>+    parser.add_option("--environment", action="append", dest="environment",
>+                      default=[], type="string",
>+                      help="define an environment variable (may be used more than once)")
>+
>     (options, args) = parser.parse_args()
>     if len(args) and args[0] in ('chroot', 'shell',
>             'rebuild', 'install', 'installdeps', 'init', 'clean'):
>@@ -431,6 +435,15 @@
> 
>     config_opts['online'] = options.online
> 
>+    for option in options.environment:
>+        try:
>+            k, v = option.split("=", 1)
>+            config_opts['environment'].update({k: v})
>+        except:
>+            raise mockbuild.exception.BadCmdline(
>+            "Bad option for '--environment' (%s).  Use --environment 'key=value'"
>+            % option)
>+
>     if options.scm:
>         config_opts['scm'] = options.scm
>         for option in options.scm_opts:
>@@ -695,6 +708,7 @@
> 
>     # Fetch and prepare sources from SCM
>     if config_opts['scm']:
>+        config_opts['scm_opts']['environment'] = config_opts['environment'].copy();
>         scmWorker = mockbuild.scm.scmWorker(log, config_opts['scm_opts'])
>         scmWorker.get_sources()
>         (options.sources, options.spec) = scmWorker.prepare_sources()
>--- /usr/lib/python2.4/site-packages/mockbuild/scm.py.orig	2012-05-29 13:25:50.000000000 +0400
>+++ /usr/lib/python2.4/site-packages/mockbuild/scm.py	2012-05-29 13:25:54.000000000 +0400
>@@ -65,12 +65,12 @@
> 
>         self.ext_src_dir = opts['ext_src_dir']
>         self.write_tar = opts['write_tar']
>+        self.environ = opts['environment']
> 
>         self.git_timestamps = opts['git_timestamps']
> 
>         self.log.debug("SCM checkout command: " + self.get)
>         self.log.debug("SCM checkout post command: " + str(self.postget))
>-        self.environ = os.environ.copy()
>         # Set HOME properly while checking out from SCM since tools like
>         # Subversion might have there settings needed to carry out checkout
>         # non-interactively

Actions: View | Diff

Attachments on bug 803217: 570811 | 571387 | 572370 | 572777 | 587386