[Python-apps-commits] r2867 - in packages/osc/trunk/debian (5 files)

[nijel at users.alioth.debian.org]

    Date: Tuesday, May 5, 2009 @ 12:19:47
  Author: nijel
Revision: 2867

* Add rlog support for srcmd5.
* Patch help output to be parsable by help2man.

Added:
  packages/osc/trunk/debian/patches/osc-help2man.patch
  packages/osc/trunk/debian/patches/osc-rlog-md5.patch
Modified:
  packages/osc/trunk/debian/changelog
  packages/osc/trunk/debian/osc.1
  packages/osc/trunk/debian/patches/series

Modified: packages/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2009-05-05 12:15:32 UTC (rev 2866)
+++ packages/osc/trunk/debian/changelog	2009-05-05 12:19:47 UTC (rev 2867)
@@ -2,8 +2,10 @@
 
   * Rediff existing patch.
   * Fix syntax error with with Python 2.4.
+  * Add rlog support for srcmd5.
+  * Patch help output to be parsable by help2man.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 05 May 2009 13:51:42 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 05 May 2009 14:15:45 +0200
 
 osc (0.117-1) unstable; urgency=low
 

Modified: packages/osc/trunk/debian/osc.1
===================================================================
--- packages/osc/trunk/debian/osc.1	2009-05-05 12:15:32 UTC (rev 2866)
+++ packages/osc/trunk/debian/osc.1	2009-05-05 12:19:47 UTC (rev 2867)
@@ -2,21 +2,13 @@
 .TH OSC "1" "May 2009" "osc 0.117" "User Commands"
 .SH NAME
 osc \- OpenSUSE build service command-line tool.
-
 .SH SYNOPSIS
-.B osc 
-.RI [GLOBALOPTS] 
-SUBCOMMAND 
-[OPTS] 
-[ARGS...]
+.B osc
+[\fIGLOBALOPTS\fR] \fISUBCOMMAND \fR[\fIOPTS\fR] [\fIARGS\fR...]
 .br
-.B osc 
-.RI help 
-SUBCOMMAND
-
-
+.B osc
+\fIhelp SUBCOMMAND\fR
 .SH DESCRIPTION
-.PP
 OpenSUSE build service command\-line tool.
 Type 'osc help <subcommand>' for help on a specific subcommand.
 .SS "commands:"
@@ -219,7 +211,6 @@
 \fB\-c\fR FILE, \fB\-\-config\fR=\fIFILE\fR
 specify alternate configuration file
 .SH "SEE ALSO"
-.PP
 For additional information, see
  * http://www.opensuse.org/Build_Service_Tutorial
  * http://www.opensuse.org/Build_Service/CLI

Added: packages/osc/trunk/debian/patches/osc-help2man.patch
===================================================================
--- packages/osc/trunk/debian/patches/osc-help2man.patch	                        (rev 0)
+++ packages/osc/trunk/debian/patches/osc-help2man.patch	2009-05-05 12:19:47 UTC (rev 2867)
@@ -0,0 +1,21 @@
+Patch by Michal ÄŒihaÅ™ <nijel at debian.org>
+
+Allow better parsing of help output by help2man.
+
+https://bugzilla.novell.com/show_bug.cgi?id=471888
+
+--- a/osc/commandline.py
++++ b/osc/commandline.py
+@@ -14,9 +14,9 @@
+ 
+ 
+ class Osc(cmdln.Cmdln):
+-    """usage:
+-        osc [GLOBALOPTS] SUBCOMMAND [OPTS] [ARGS...]
+-        osc help SUBCOMMAND
++    """Usage: osc [GLOBALOPTS] SUBCOMMAND [OPTS] [ARGS...]
++    or: osc help SUBCOMMAND
++
+     OpenSUSE build service command-line tool.
+     Type 'osc help <subcommand>' for help on a specific subcommand.
+ 

Added: packages/osc/trunk/debian/patches/osc-rlog-md5.patch
===================================================================
--- packages/osc/trunk/debian/patches/osc-rlog-md5.patch	                        (rev 0)
+++ packages/osc/trunk/debian/patches/osc-rlog-md5.patch	2009-05-05 12:19:47 UTC (rev 2867)
@@ -0,0 +1,31 @@
+Patch by Michal ÄŒihaÅ™ <nijel at debian.org>
+
+Allow rlog to handle srcmd5.
+
+https://bugzilla.novell.com/show_bug.cgi?id=460538
+
+--- a/osc/core.py
++++ b/osc/core.py
+@@ -2970,15 +2970,19 @@
+     revisions = root.findall('revision')
+     revisions.reverse()
+     for node in revisions:
++        srcmd5 = node.find('srcmd5').text
+         try:
+             rev = int(node.get('rev'))
+             #vrev = int(node.get('vrev')) # what is the meaning of vrev?
+-            if revision and rev != int(revision):
+-                continue
++            try:
++                if revision and rev != int(revision):
++                    continue
++            except ValueError:
++                if revision != srcmd5:
++                    continue
+         except ValueError:
+             # this part should _never_ be reached but...
+             return [ 'an unexpected error occured - please file a bug' ]
+-        srcmd5 = node.find('srcmd5').text
+         version = node.find('version').text
+         user = node.find('user').text
+         try:

Modified: packages/osc/trunk/debian/patches/series
===================================================================
--- packages/osc/trunk/debian/patches/series	2009-05-05 12:15:32 UTC (rev 2866)
+++ packages/osc/trunk/debian/patches/series	2009-05-05 12:19:47 UTC (rev 2867)
@@ -1,2 +1,4 @@
 no-shebang.patch
 fix-syntax.patch
+osc-help2man.patch
+osc-rlog-md5.patch