Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at Thu Aug 25 12:18:29 CEST 2011.
-------- --- osc/osc.changes 2011-08-16 15:09:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/osc/osc.changes 2011-08-25 11:40:33.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Aug 25 09:37:44 UTC 2011 - [email protected] + +- update to 0.132.6 + * fix crash on removal of local _service file + * handle both old OBS versions before 2.3 + * fix pgp pubkey parsing + * show created incident project + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- osc-0.132.5.tar.gz osc-pubkey-parsing.patch New: ---- osc-0.132.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.gc0rUp/_old 2011-08-25 12:18:00.000000000 +0200 +++ /var/tmp/diff_new_pack.gc0rUp/_new 2011-08-25 12:18:00.000000000 +0200 @@ -18,14 +18,13 @@ Name: osc -Version: 0.132.5 -Release: 2 +Version: 0.132.6 +Release: 1 License: GPLv2+ Summary: openSUSE Build Service Commander Url: http://www.gitorious.org/opensuse/osc Group: Development/Tools/Other Source: %{name}-%{version}.tar.gz -Patch1: osc-pubkey-parsing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?mandriva_version} < 02010 BuildRequires: python-urlgrabber @@ -89,7 +88,6 @@ %prep %setup -q -%patch1 -p1 %build CFLAGS="%{optflags}" python setup.py build ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.gc0rUp/_old 2011-08-25 12:18:00.000000000 +0200 +++ /var/tmp/diff_new_pack.gc0rUp/_new 2011-08-25 12:18:00.000000000 +0200 @@ -1,3 +1,8 @@ +osc (0.132.6-1) unstable; urgency=low + - Update to 0.132.6 + + -- Adrian Schroeter <[email protected]> Wed, 24 Aug 2011 10:00:00 +0200 + osc (0.132.5-1) unstable; urgency=low - Update to 0.132.5 ++++++ osc-0.132.5.tar.gz -> osc-0.132.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.132.5/osc/checker.py new/osc-0.132.6/osc/checker.py --- old/osc-0.132.5/osc/checker.py 2011-06-15 14:19:07.000000000 +0200 +++ new/osc-0.132.6/osc/checker.py 2011-08-25 11:36:13.000000000 +0200 @@ -61,16 +61,24 @@ key = '' line = fd.readline() + crc = None while line: if line[0:12] == "-----END PGP": break line = line.rstrip() - key += line - line = fd.readline() + if (line[0] == '='): + crc = line[1:] + line = fd.readline() + break + else: + key += line + line = fd.readline() fd.close() if not line or line[0:12] != "-----END PGP": raise KeyError(file, "not a pgp public key") + # TODO: compute and compare CRC, see RFC 2440 + bkey = base64.b64decode(key) r = self.ts.pgpImportPubkey(bkey) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.132.5/osc/commandline.py new/osc-0.132.6/osc/commandline.py --- old/osc-0.132.5/osc/commandline.py 2011-07-07 06:48:29.000000000 +0200 +++ new/osc-0.132.6/osc/commandline.py 2011-08-25 11:36:13.000000000 +0200 @@ -2546,7 +2546,15 @@ query["noaccess"] = 1 url = makeurl(apiurl, ['source', target_project], query=query) r = http_POST(url, data=opts.message) - print ET.parse(r).getroot().get('code') + project = None + for i in ET.fromstring(r.read()).findall('data'): + if i.get('name') == 'targetproject': + project = i.text.strip() + if project: + print "Incident project created: ", project + else: + print ET.parse(r).getroot().get('code') + print ET.parse(r).getroot().get('error') @cmdln.option('-a', '--attribute', metavar='ATTRIBUTE', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.132.5/osc/core.py new/osc-0.132.6/osc/core.py --- old/osc-0.132.5/osc/core.py 2011-07-07 06:49:03.000000000 +0200 +++ new/osc-0.132.6/osc/core.py 2011-08-25 11:36:13.000000000 +0200 @@ -250,7 +250,7 @@ root = ET.parse(f).getroot() self.read(root, True) except urllib2.HTTPError, e: - if e.code != 400: + if e.code != 403 and e.code != 400: raise e def addVerifyFile(self, serviceinfo_node, filename): @@ -2063,9 +2063,10 @@ curdir = os.getcwd() os.chdir(self.absdir) # e.g. /usr/lib/obs/service/verify_file fails if not inside the project dir. si = Serviceinfo() - if self.filenamelist.count('_service') or self.filenamelist_unvers.count('_service'): - service = ET.parse(os.path.join(self.absdir, '_service')).getroot() - si.read(service) + if os.path.exists('_service'): + if self.filenamelist.count('_service') or self.filenamelist_unvers.count('_service'): + service = ET.parse(os.path.join(self.absdir, '_service')).getroot() + si.read(service) si.getProjectGlobalServices(self.apiurl, self.prjname, self.name) r = si.execute(self.absdir, mode, singleservice, verbose) os.chdir(curdir) ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.gc0rUp/_old 2011-08-25 12:18:00.000000000 +0200 +++ /var/tmp/diff_new_pack.gc0rUp/_new 2011-08-25 12:18:00.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.132.5 +Version: 0.132.6 Binary: osc Maintainer: Adrian Schroeter <[email protected]> Architecture: any ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
