From 0f430d34dac6553e8ed03b46b49e14d1f59e3f0e Mon Sep 17 00:00:00 2001 From: Zhang Qiang Date: Thu, 25 Apr 2013 09:11:17 +0800 Subject: [PATCH] use extra local vars instead of using class vars to avoid overwrite Change-Id: Id1df156b6851e2bccab9641eb1aeaa9f466aabe0 --- gitbuildsys/utils.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gitbuildsys/utils.py b/gitbuildsys/utils.py index 1513b1f..d618459 100644 --- a/gitbuildsys/utils.py +++ b/gitbuildsys/utils.py @@ -446,26 +446,26 @@ class RepoParser(object): all_repos.extend(self.repourls[arch]) for repo in all_repos: group_url = repo.pathjoin('repodata/group.xml') - self.group_file['name'] = self.fetch(group_url) - if not self.group_file['name']: + group_file = self.fetch(group_url) + if not group_file: continue - with open(self.group_file['name'], 'rb') as fobj: + with open(group_file, 'rb') as fobj: md5sum = hexdigest(fobj) - if 'md5sum' in self.group_file and \ - md5sum != self.group_file['md5sum']: + if md5sum != self.group_file['md5sum']: log.warning('multiple differnent group files found') + self.group_file['name'] = group_file self.group_file['md5sum'] = md5sum pattern_url = repo.pathjoin('repodata/patterns.xml') - self.pattern_file['name'] = self.fetch(pattern_url) - if not self.pattern_file['name']: + pattern_file = self.fetch(pattern_url) + if not pattern_file: log.warning('pattern/group files do not exist in the same repo') continue - with open(self.pattern_file['name'], 'rb') as fobj: + with open(pattern_file, 'rb') as fobj: md5sum = hexdigest(fobj) - if 'md5sum' in self.pattern_file and \ - md5sum != self.pattern_file['md5sum']: + if md5sum != self.pattern_file['md5sum']: log.warning('multiple differnent pattern files found') + self.pattern_file['name'] = pattern_file self.pattern_file['md5sum'] = md5sum @staticmethod -- 2.7.4