bugfix: check real group/pattern name to fix backtrace issue

Change-Id: I4bbd9aa3e92b5172323223fbb4c5ae3e0375fc87

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index dd0ce380b38e6ec67fd7b29928451e2331cd0522..adf5be1e76cf0877689cd6e35e9eb59e6264f14d 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -108,9 +108,9 @@ def prepare_repos_and_build_conf(args, arch, profile):
     if not os.path.exists(meta_dir):
         os.makedirs(meta_dir)
 
-    if repoparser.group_file:
+    if repoparser.group_file['name']:
         shutil.copy(repoparser.group_file['name'], meta_dir)
-    if repoparser.pattern_file:
+    if repoparser.pattern_file['name']:
         shutil.copy(repoparser.pattern_file['name'], meta_dir)
 
     repourls = repoparser.get_repos_by_arch(arch)

diff --git a/gitbuildsys/utils.py b/gitbuildsys/utils.py
index 7f92b14e8cf58779be30a3b7021ea4b43f12dc7f..d00d289838b37910b274beed1c48bb3516092905 100644 (file)
--- a/gitbuildsys/utils.py
+++ b/gitbuildsys/utils.py
@@ -258,8 +258,8 @@ class RepoParser(object):
         self.cachedir = cachedir
         self.repourls  = defaultdict(list)
         self.buildconf = None
-        self.group_file = {}
-        self.pattern_file = {}
+        self.group_file = defaultdict(str)
+        self.pattern_file = defaultdict(str)
         self.standardrepos = []
         self.urlgrabber = URLGrabber()