From 93f2fc6989246ae0bad9179ed90f234f4580fd60 Mon Sep 17 00:00:00 2001 From: Zhang Qiang Date: Mon, 22 Apr 2013 17:54:50 +0800 Subject: [PATCH] bugfix: check real group/pattern name to fix backtrace issue Change-Id: I4bbd9aa3e92b5172323223fbb4c5ae3e0375fc87 --- gitbuildsys/cmd_build.py | 4 ++-- gitbuildsys/utils.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py index dd0ce38..adf5be1 100644 --- 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 7f92b14..d00d289 100644 --- 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() -- 2.7.4