[gnome-ostree] vcs: Fix bug when multiple git submodules are in use



commit f16be0af7fda9836c42091ed141632a4983a5c45
Author: Colin Walters <walters verbum org>
Date:   Tue Nov 27 20:39:34 2012 -0500

    vcs: Fix bug when multiple git submodules are in use
    
    An uninitial variable reassignment broke things.

 src/ostbuild/pyostbuild/vcs.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/ostbuild/pyostbuild/vcs.py b/src/ostbuild/pyostbuild/vcs.py
index 5ec06f6..809cb95 100755
--- a/src/ostbuild/pyostbuild/vcs.py
+++ b/src/ostbuild/pyostbuild/vcs.py
@@ -40,8 +40,8 @@ def _fixup_submodule_references(mirrordir, cwd):
         (sub_checksum, sub_name) = line.split(' ', 1)
         sub_url = run_sync_get_output(['git', 'config', '-f', '.gitmodules',
                                        'submodule.%s.url' % (sub_name, )], cwd=cwd)
-        mirrordir = get_mirrordir(mirrordir, 'git', sub_url)
-        run_sync(['git', 'config', 'submodule.%s.url' % (sub_name, ), 'file://' + mirrordir], cwd=cwd)
+        local_mirror = get_mirrordir(mirrordir, 'git', sub_url)
+        run_sync(['git', 'config', 'submodule.%s.url' % (sub_name, ), 'file://' + local_mirror], cwd=cwd)
     return have_submodules
 
 def get_vcs_checkout(mirrordir, keytype, uri, dest, branch, overwrite=True,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]