Hello community,
here is the log from the commit of package osc for openSUSE:12.2 checked in at 2012-07-02 11:05:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/osc (Old)
and /work/SRC/openSUSE:12.2/.osc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc", Maintainer is "adrian@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.2/osc/osc.changes 2012-06-28 16:31:04.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.osc.new/osc.changes 2012-07-02 11:05:10.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 29 08:59:05 UTC 2012 - adrian@suse.de
+
+- update to 0.135.1
+ * do not forward submit requests to targets which link to request target
+ * fix creator name in forwarded message
+
+-------------------------------------------------------------------
Old:
----
osc-0.135.0.tar.gz
New:
----
osc-0.135.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ osc.spec ++++++
--- /var/tmp/diff_new_pack.dKi6Hz/_old 2012-07-02 11:05:10.000000000 +0200
+++ /var/tmp/diff_new_pack.dKi6Hz/_new 2012-07-02 11:05:10.000000000 +0200
@@ -17,7 +17,7 @@
Name: osc
-Version: 0.135.0
+Version: 0.135.1
Release: 0
Summary: openSUSE Build Service Commander
License: GPL-2.0+
++++++ _service ++++++
--- /var/tmp/diff_new_pack.dKi6Hz/_old 2012-07-02 11:05:10.000000000 +0200
+++ /var/tmp/diff_new_pack.dKi6Hz/_new 2012-07-02 11:05:10.000000000 +0200
@@ -1,6 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">0.135.0</param>
+ <param name="version">0.135.1</param>
<param name="url">git://github.com/openSUSE/osc.git</param>
<param name="scm">git</param>
</service>
++++++ osc-0.135.0.tar.gz -> osc-0.135.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.135.0/NEWS new/osc-0.135.1/NEWS
--- old/osc-0.135.0/NEWS 2012-06-28 11:22:35.000000000 +0200
+++ new/osc-0.135.1/NEWS 2012-06-30 11:24:14.000000000 +0200
@@ -1,3 +1,6 @@
+0.135.1
+ - do not forward requests to packages which do link anyway to original request target
+
0.135
- request accept is offering now to forward submit request if it is a devel area like webui does
- support archlinux builds (requires OBS 2.4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.135.0/osc/commandline.py new/osc-0.135.1/osc/commandline.py
--- old/osc-0.135.0/osc/commandline.py 2012-06-28 11:22:35.000000000 +0200
+++ new/osc-0.135.1/osc/commandline.py 2012-06-30 11:24:14.000000000 +0200
@@ -2170,14 +2170,34 @@
for node in root.findall('package'):
project = node.get('project')
package = node.get('name')
+ # skip it when this is anyway a link to me
+ link_url = makeurl(apiurl, ['source', project, package])
+ links_to_project = links_to_package = None
+ try:
+ file = http_GET(link_url)
+ root = ET.parse(file).getroot()
+ link_node = root.find('linkinfo')
+ if link_node != None:
+ links_to_project = link_node.get('project') or project
+ links_to_package = link_node.get('package') or package
+ except urllib2.HTTPError, e:
+ if e.code != 404:
+ print >>sys.stderr, 'Cannot get list of files for %s/%s: %s' % (project, package, e)
+ except SyntaxError, e:
+ print >>sys.stderr, 'Cannot parse list of files for %s/%s: %s' % (project, package, e)
+ if links_to_project==action.tgt_project and links_to_package==action.tgt_package:
+ # links to my request target anyway, no need to forward submit
+ continue
+
print project,
if package != action.tgt_package:
print "/", package,
repl = raw_input('\nForward this submit to it? ([y]/n)')
if repl.lower() == 'y' or repl == '':
- msg = cgi.escape("%s (forwarded request %s from %s)" % ( rq.description, reqid, rq.get_creator))
+ msg = "%s (forwarded request %s from %s)" % ( rq.description, reqid, rq.get_creator())
+ print msg
rid = create_submit_request(apiurl, action.tgt_project, action.tgt_package,
- project, package, msg)
+ project, package, cgi.escape(msg))
print "New request #", rid
# editmeta and its aliases are all depracated
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.135.0/osc/core.py new/osc-0.135.1/osc/core.py
--- old/osc-0.135.0/osc/core.py 2012-06-28 11:22:35.000000000 +0200
+++ new/osc-0.135.1/osc/core.py 2012-06-30 11:24:14.000000000 +0200
@@ -1830,7 +1830,7 @@
print
print "The link in this package is currently broken. Checking"
print "out the last working version instead; please use 'osc pull'"
- print "to repair the link."
+ print "to merge the conflicts."
print
def unmark_frozen(self):
++++++ osc.dsc ++++++
--- /var/tmp/diff_new_pack.dKi6Hz/_old 2012-07-02 11:05:10.000000000 +0200
+++ /var/tmp/diff_new_pack.dKi6Hz/_new 2012-07-02 11:05:10.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: osc
-Version: 0.135.0
+Version: 0.135.1
Binary: osc
Maintainer: Adrian Schroeter