[Pkg-electronics-commits] [SCM] Packaging for gEDA branch, master, updated. debian/1.6.1-3-2-gcdbd8d6

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 22eb703b4eef7eaaec9fc075d79f5276bdec3e72
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Thu Jun 10 09:03:18 2010 +0300

    Added fix_string_exceptions.diff patch to fix string exceptions in
    utils/scripts/garchive.py (Closes: #585213)

diff --git a/debian/patches/fix_string_exceptions.diff b/debian/patches/fix_string_exceptions.diff
new file mode 100644
index 0000000..a4cc4ae
--- /dev/null
+++ b/debian/patches/fix_string_exceptions.diff
@@ -0,0 +1,43 @@
+Description: String exceptions have been deprecated since Python 2.5
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585213
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3014181&group_id=161080&atid=818428
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+--- a/utils/scripts/garchive.py
++++ b/utils/scripts/garchive.py
+@@ -275,15 +275,15 @@
+ 
+             if Option == '-a':
+                 if self.ProgramMode == "extract":          # sanity check
+-                    raise "Incompatible command line args"
++                    raise SyntaxError("Incompatible command line args")
+ 
+             if Option == '-e':
+                 if self.ProgramMode == "archive":          # sanity check
+-                    raise "Incompatible command line args"
++                    raise SyntaxError("Incompatible command line args")
+ 
+             if Option == '-f':
+                 if self.ProgramMode == "extract":          # sanity check
+-                    raise "Incompatible command line args"
++                    raise SyntaxError("Incompatible command line args")
+                 try:
+                     os.stat(Value)
+                 except OSError:
+@@ -294,7 +294,7 @@
+ 
+             if Option == '-o':
+                 if self.ProgramMode == "extract":          # sanity check
+-                    raise "incompatible command line args"
++                    raise SyntaxError("Incompatible command line args")
+                 if CheckFilename(Value):
+                     self.OutputFileName = Value            #strcopy?
+                 else:
+@@ -904,7 +904,7 @@
+     Extract(Args)
+     sys.exit(0)
+ else:
+-    raise "Unknown program mode found."
++    raise RuntimeError("Unknown program mode found.")
+ 
+ #  That's it -- very simple!!
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2e0e029..561c79a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 desktop.diff
 manpage_typos.diff
 sch2eaglepos_bashism.diff
+fix_string_exceptions.diff

-- 
Packaging for gEDA