Hello community,
here is the log from the commit of package osc for openSUSE:Factory checked in
at 2013-04-17 23:13:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/osc (Old)
and /work/SRC/openSUSE:Factory/.osc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc", Maintainer is "adr...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/osc/osc.changes 2013-03-01 07:38:55.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2013-04-17
23:13:51.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Apr 16 07:15:57 UTC 2013 - adr...@suse.de
+
+- 0.139.2
+ - fix build on ppc/s390/ia64 (bnc#815296)
+ - when forwarding a request, previous request is
+ not superseded automatically (bnc#807621)
+ - fix with/without definitions, --with should not define
+ %_without and vice versa
+ - Abort when the server is not answering with 200 or 404 when
+ downloading _pubkey files - really use the internal rpm signature check
+ - some spelling corrections
+
+-------------------------------------------------------------------
Old:
----
osc-0.139.1.tar.gz
New:
----
osc-0.139.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ osc.spec ++++++
--- /var/tmp/diff_new_pack.K2V8qe/_old 2013-04-17 23:13:53.000000000 +0200
+++ /var/tmp/diff_new_pack.K2V8qe/_new 2013-04-17 23:13:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: osc
-Version: 0.139.1
+Version: 0.139.2
Release: 0
Summary: openSUSE Build Service Commander
License: GPL-2.0+
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.K2V8qe/_old 2013-04-17 23:13:53.000000000 +0200
+++ /var/tmp/diff_new_pack.K2V8qe/_new 2013-04-17 23:13:53.000000000 +0200
@@ -1,5 +1,5 @@
pkgname=osc
-pkgver=0.139.1
+pkgver=0.139.2
pkgrel=1
pkgdesc="Open Build Service client"
arch=('i686' 'x86_64')
++++++ _service ++++++
--- /var/tmp/diff_new_pack.K2V8qe/_old 2013-04-17 23:13:53.000000000 +0200
+++ /var/tmp/diff_new_pack.K2V8qe/_new 2013-04-17 23:13:53.000000000 +0200
@@ -1,6 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">0.139.1</param>
+ <param name="version">0.139.2</param>
<param name="revision">0.139</param>
<param name="url">git://github.com/openSUSE/osc.git</param>
<param name="scm">git</param>
++++++ osc-0.139.1.tar.gz -> osc-0.139.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.139.1/osc/build.py new/osc-0.139.2/osc/build.py
--- old/osc-0.139.1/osc/build.py 2013-02-26 14:09:48.000000000 +0100
+++ new/osc-0.139.2/osc/build.py 2013-04-16 09:15:50.000000000 +0200
@@ -518,12 +518,10 @@
s = ''
for i in opts.without:
s += "%%define _without_%s 1\n" % i
- s += "%%define _with_%s 0\n" % i
build_descr_data = s + build_descr_data
if opts._with:
s = ''
for i in opts._with:
- s += "%%define _without_%s 0\n" % i
s += "%%define _with_%s 1\n" % i
build_descr_data = s + build_descr_data
if opts.define:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.139.1/osc/commandline.py
new/osc-0.139.2/osc/commandline.py
--- old/osc-0.139.1/osc/commandline.py 2013-02-26 14:09:48.000000000 +0100
+++ new/osc-0.139.2/osc/commandline.py 2013-04-16 09:15:50.000000000 +0200
@@ -1100,21 +1100,14 @@
if opts.diff:
run_pager(rdiff)
return
-
- # Are there already requests to this package ?
- reqs = get_exact_request_list(apiurl, src_project, dst_project,
src_package, dst_package, req_type='submit', req_state=['new','review',
'declined'])
- myreqs = [ i for i in reqs ]
- user = conf.get_apiurl_usr(apiurl)
- repl = ''
-
- if len(myreqs) > 0 and not opts.supersede:
- print 'There are already following submit request: %s.' % \
- ', '.join([i.reqid for i in myreqs ])
- repl = raw_input('Supersede the old requests? (y/n/c) ')
- if repl.lower() == 'c':
- print >>sys.stderr, 'Aborting'
- raise oscerr.UserAbort()
-
+ supersede_existing = False
+ reqs = []
+ if not opts.supersede:
+ (supersede_existing, reqs) = check_existing_requests(apiurl,
+ src_project,
+ src_package,
+ dst_project,
+ dst_package)
if not opts.message:
difflines = []
doappend = False
@@ -1133,8 +1126,8 @@
src_project, src_package,
dst_project, dst_package,
opts.message, orev=rev,
src_update=src_update)
- if repl.lower() == 'y':
- for req in myreqs:
+ if supersede_existing:
+ for req in reqs:
change_request_state(apiurl, req.reqid, 'superseded',
'superseded by %s' % result, result)
@@ -2203,11 +2196,16 @@
print "/", package,
repl = raw_input('\nForward this submit to it?
([y]/n)')
if repl.lower() == 'y' or repl == '':
- msg = "%s (forwarded request %s from %s)" %
( rq.description, reqid, rq.get_creator())
- print msg
+ (supersede, reqs) =
check_existing_requests(apiurl, action.tgt_project, action.tgt_package,
+
project, package)
+ msg = "%s (forwarded request %s from %s)" %
(rq.description, reqid, rq.get_creator())
rid = create_submit_request(apiurl,
action.tgt_project, action.tgt_package,
project, package, cgi.escape(msg))
+ print msg
print "New request #", rid
+ for req in reqs:
+ change_request_state(apiurl, req.reqid,
'superseded',
+ 'superseded by %s'
% rid, rid)
# editmeta and its aliases are all depracated
@cmdln.alias("editprj")
@@ -5100,9 +5098,9 @@
if arg.endswith('.spec') or arg.endswith('.dsc') or
arg.endswith('.kiwi') or arg == 'PKGBUILD':
arg_descr = arg
else:
- if osc.build.can_also_build.get(arg) != None and arg_arch
is None:
+ if (arg == osc.build.hostarch or
osc.build.can_also_build.get(arg) != None) and arg_arch is None:
arg_arch = arg
- if not (arg in
osc.build.can_also_build.get(osc.build.hostarch, []) or arg in
osc.build.hostarch):
+ if not (arg in
osc.build.can_also_build.get(osc.build.hostarch, []) or arg ==
osc.build.hostarch):
print "WARNING: native compile is not possible,
an emulator must be configured!"
elif not arg_repository:
arg_repository = arg
@@ -5733,7 +5731,7 @@
COMMAND can be:
run r run defined services locally, it takes an optional
parameter to run only a
- specified source service. In case paramteres exists
for this one in _service file
+ specified source service. In case parameters exist
for this one in _service file
they are used.
disabledrun dr run disabled or server side only services locally
and store files as local created
remoterun rr trigger a re-run on the server side
@@ -6779,14 +6777,14 @@
help='Specify user role')
@cmdln.alias('bugowner')
def do_maintainer(self, subcmd, opts, *args):
- """${cmd_name}: Show maintainers of a project/package
+ """${cmd_name}: Show maintainers according to server side configuration
# Search for official maintained sources in OBS instance
osc maintainer BINARY <options>
osc maintainer -U <user> <options>
osc maintainer -G <group> <options>
- # Lookup in specific containers
+ # Lookup via containers
osc maintainer <options>
osc maintainer PRJ <options>
osc maintainer PRJ PKG <options>
@@ -6795,6 +6793,11 @@
When using with an OBS 2.4 (or later) server it is doing the lookup for
a given binary according to the server side configuration of default
owners.
+ The tool is also looking into devel packages and supports to fallback
to the project
+ in case a package has no defined maintainer.
+
+ Please use "osc meta pkg" in case you need to know the definition in a
specific container.
+
PRJ and PKG default to current working-copy path.
${cmd_usage}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.139.1/osc/conf.py new/osc-0.139.2/osc/conf.py
--- old/osc-0.139.1/osc/conf.py 2013-02-26 14:09:48.000000000 +0100
+++ new/osc-0.139.2/osc/conf.py 2013-04-16 09:15:50.000000000 +0200
@@ -452,7 +452,7 @@
return None
authhandler_class = OscHTTPBasicAuthHandler
- elif sys.version_info >= (2, 6, 6) and sys.version_info < (2, 7, 1):
+ elif sys.version_info >= (2, 6, 6) and sys.version_info < (2, 7, 99):
class OscHTTPBasicAuthHandler(urllib2.HTTPBasicAuthHandler):
def http_error_404(self, *args):
self.reset_retry_count()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.139.1/osc/core.py new/osc-0.139.2/osc/core.py
--- old/osc-0.139.1/osc/core.py 2013-02-26 14:09:48.000000000 +0100
+++ new/osc-0.139.2/osc/core.py 2013-04-16 09:15:50.000000000 +0200
@@ -3851,6 +3851,21 @@
data.append(s)
return data
+def check_existing_requests(apiurl, src_project, src_package, dst_project,
+ dst_package):
+ reqs = get_exact_request_list(apiurl, src_project, dst_project,
+ src_package, dst_package,
+ req_type='submit',
+ req_state=['new','review', 'declined'])
+ repl = ''
+ if reqs:
+ print 'There are already the following submit request: %s.' % \
+ ', '.join([i.reqid for i in reqs])
+ repl = raw_input('Supersede the old requests? (y/n/c) ')
+ if repl.lower() == 'c':
+ print >>sys.stderr, 'Aborting'
+ raise oscerr.UserAbort()
+ return repl == 'y', reqs
def get_group(apiurl, group):
u = makeurl(apiurl, ['group', quote_plus(group)])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-0.139.1/osc/fetch.py new/osc-0.139.2/osc/fetch.py
--- old/osc-0.139.1/osc/fetch.py 2013-02-26 14:09:48.000000000 +0100
+++ new/osc-0.139.2/osc/fetch.py 2013-04-16 09:15:50.000000000 +0200
@@ -270,6 +270,11 @@
os.unlink(dest)
sys.exit(0)
except URLGrabError, e:
+ # Not found is okay, let's go to the next project
+ if e.code != 404:
+ print >>sys.stderr, "Invalid answer from server", e
+ sys.exit(1)
+
if self.http_debug:
print >>sys.stderr, "can't fetch key for %s: %s" %(i,
e.strerror)
print >>sys.stderr, "url: %s" % url
@@ -356,7 +361,7 @@
"""
pac_list = [ i.fullfilename for i in bi.deps ]
- if not conf.config['builtin_signature_check']:
+ if conf.config['builtin_signature_check'] != True:
return verify_pacs_old(pac_list)
if not pac_list:
++++++ osc.dsc ++++++
--- /var/tmp/diff_new_pack.K2V8qe/_old 2013-04-17 23:13:53.000000000 +0200
+++ /var/tmp/diff_new_pack.K2V8qe/_new 2013-04-17 23:13:53.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: osc
-Version: 0.139.1
+Version: 0.139.2
Binary: osc
Maintainer: Adrian Schroeter <adr...@suse.de>
Architecture: any
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
