rpms/audio-convert-mod/FC-6 acm-runapp.py-usage.patch, NONE, 1.1 audio-convert-mod.spec, 1.2, 1.3

[Stewart Adam (firewing)]

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9629

Modified Files:
	audio-convert-mod.spec 
Added Files:
	acm-runapp.py-usage.patch 
Log Message:
* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
- Fix traceback upon calling --help



acm-runapp.py-usage.patch:

--- NEW FILE acm-runapp.py-usage.patch ---
Index: acm-runapp.py
===================================================================
--- acm-runapp.py	(revision 227)
+++ acm-runapp.py	(working copy)
@@ -61,9 +61,8 @@
     # letter = plain options
     # letter: = option with arg
     (opts, rest_args) = getopt.gnu_getopt(sys.argv[1:],"hv", avalableOptions)
-  except (getopt.GetoptError), e:
-    print e, ""
-    usage()
+  except (getopt.GetoptError), error:
+    usage(str(error))
     sys.exit(1)
   # Remove options from paths
   paths = sys.argv[1:]
@@ -79,7 +78,7 @@
   else:
     for (opt, value) in opts:
       if opt == "-h" or opt == "--help":
-        usage()
+        usage('')
         sys.exit(1)
       if opt == "-v" or opt == "--verbose":
         audio_convert_mod.setVerbose(True)


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/FC-6/audio-convert-mod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio-convert-mod.spec	5 Sep 2007 12:42:03 -0000	1.2
+++ audio-convert-mod.spec	8 Sep 2007 16:24:15 -0000	1.3
@@ -2,13 +2,14 @@
 %define pythonname audio_convert_mod
 Name:              audio-convert-mod
 Version:           3.45.2
-Release:           1%{?dist}
+Release:           2%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/content/view/13/47/lang,en/
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Patch0:            acm-runapp.py-usage.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
@@ -29,6 +30,10 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+pushd src
+%patch0 -p0 -b .patch0
+popd
+
 %build
 make %{?_smp_mflags}
 
@@ -59,6 +64,9 @@
 %doc AUTHORS README COPYING CHANGELOG TODO
 
 %changelog
+* Sat Sep 8 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-2
+- Fix traceback upon calling --help
+
 * Wed Sep 5 2007 Stewart Adam <s.adam at diffingo.com> 3.45.2-1
 - Update to 3.45.2 (see CHANGELOG file for details on version changes)
 - Fixes RH#277871