From 462559e33d0e3e5506eba6f502fcba283400276b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 25 Mar 2008 11:26:06 -0400 Subject: sync with upstream --- PackageOwners.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) mode change 100755 => 100644 PackageOwners.py diff --git a/PackageOwners.py b/PackageOwners.py old mode 100755 new mode 100644 index e79f167..8a8723e --- a/PackageOwners.py +++ b/PackageOwners.py @@ -43,13 +43,14 @@ class PackageOwners: def FromURL(self, retries=3, retrysecs=300, url='https://admin.fedoraproject.org/pkgdb/acls/bugzilla?tg_format=plain', - pkgdb=True, username=None, password=None): + pkgdb=True, repoid='Fedora', username=None, password=None): # old url='http://cvs.fedora.redhat.com/viewcvs/*checkout*/owners/owners.list?root=extras' if pkgdb: self.how = 'pkgdb' else: self.how = 'url' self.url = url + self.repoid = repoid self.retries = retries self.retrysecs = retrysecs self.username = username @@ -57,9 +58,10 @@ class PackageOwners: return self._refresh() - def FromCVS(self, retries=3, retrysecs=300, command='LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous@cvs.fedora.redhat.com:/cvs/extras co owners', workdir=''): + def FromCVS(self, retries=3, retrysecs=300, command='LC_ALL=C CVS_RSH=ssh cvs -f -d :pserver:anonymous@cvs.fedora.redhat.com:/cvs/extras co owners', workdir='',repoid='Fedora'): self.how = 'cvs' self.command = command + self.repoid = repoid self.retries = retries self.retrysecs = retrysecs self.workdir = workdir @@ -122,9 +124,12 @@ class PackageOwners: continue try: (repo,pkgname,summary,emails,qacontact,cc) = line.rstrip().split('|') + # This is commented, because we don't need the summary. + #summary.replace(r'\u007c','|').replace('\u005c','\\') + # The PkgDb includes repo's other than Fedora (Fedora EPEL, # Fedora OLPC, and Red Hat Linux, for example). Skip them. - if repo != 'Fedora': + if repo != self.repoid: continue def fixaddr(a): # Old Fedora CVS owners.list contains e-mail addresses. @@ -244,8 +249,12 @@ class PackageOwners: self.usermap = {} for line in fasdump: fields = line.split(',') - user = fields[0] - addr = fields[1] + try: + user = fields[0] + addr = fields[1] + except IndexError: + print line + raise if (addr.find('@') < 0): # unexpected, no addr print 'No email in:', line raise Exception -- cgit