[med-svn] r20809 - in trunk/packages/probalign/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-12-17 14:10:46 +0000 (Thu, 17 Dec 2015)
New Revision: 20809

Added:
   trunk/packages/probalign/trunk/debian/patches/mayhem.patch
Modified:
   trunk/packages/probalign/trunk/debian/changelog
   trunk/packages/probalign/trunk/debian/patches/series
Log:
That's a pretty dirty patch ... fitting the pretty dirty code very consistently; authors might grab a C++ book for the usage of getopt


Modified: trunk/packages/probalign/trunk/debian/changelog
===================================================================
--- trunk/packages/probalign/trunk/debian/changelog	2015-12-17 13:21:14 UTC (rev 20808)
+++ trunk/packages/probalign/trunk/debian/changelog	2015-12-17 14:10:46 UTC (rev 20809)
@@ -1,8 +1,10 @@
-probalign (1.4-4) UNRELEASED; urgency=medium
+probalign (1.4-4) unstable; urgency=medium
 
   * cme fix dpkg-control
+  * Fix Mayhem issue
+    Closes: #716548
 
- -- Andreas Tille <tille at debian.org>  Thu, 17 Dec 2015 14:20:53 +0100
+ -- Andreas Tille <tille at debian.org>  Thu, 17 Dec 2015 15:03:20 +0100
 
 probalign (1.4-3) unstable; urgency=low
 

Added: trunk/packages/probalign/trunk/debian/patches/mayhem.patch
===================================================================
--- trunk/packages/probalign/trunk/debian/patches/mayhem.patch	                        (rev 0)
+++ trunk/packages/probalign/trunk/debian/patches/mayhem.patch	2015-12-17 14:10:46 UTC (rev 20809)
@@ -0,0 +1,33 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 17 Dec 2015 14:20:53 +0100
+Bug-Debian: https://bugs.debian.org/716548
+Description: This patch is a bit non-C++-ish but I'm not a C++
+ programmer and considered this at least a solution and code that
+ ignores getopt does not deserve more care. :-(
+
+--- a/Main.cc
++++ b/Main.cc
+@@ -535,6 +533,7 @@ SafeVector < string > ParseParams(int ar
+     
+     float tempFloat;
+     int tempInt;
++    int has_sequence_argument = 0;
+     
+     for (int i = 1; i < argc; i++)
+     {
+@@ -796,10 +795,15 @@ SafeVector < string > ParseParams(int ar
+ 	}
+ 	else
+ 	{
++	    has_sequence_argument = 1;
+ 	    sequenceNames.push_back(string(argv[i]));
+ 	}
+     }
+ 
++    if (!has_sequence_argument) {
++	cerr << "ERROR: No MFAFILE specified" << endl;
++	exit(1);
++    }
+ 
+     return sequenceNames;
+ }

Modified: trunk/packages/probalign/trunk/debian/patches/series
===================================================================
--- trunk/packages/probalign/trunk/debian/patches/series	2015-12-17 13:21:14 UTC (rev 20808)
+++ trunk/packages/probalign/trunk/debian/patches/series	2015-12-17 14:10:46 UTC (rev 20809)
@@ -1,3 +1,4 @@
 gcc_fixes.patch
 fix-gcc-4.6.patch
 hardening.patch
+mayhem.patch