[med-svn] r7049 - trunk/packages/mgltools/pmv/trunk/debian/patches

[Steffen Möller]

Author: moeller
Date: 2011-06-16 20:02:08 +0000 (Thu, 16 Jun 2011)
New Revision: 7049

Modified:
   trunk/packages/mgltools/pmv/trunk/debian/patches/fix_string_exceptions.patch
Log:
Adjusted patch to Pvm (already applied by upstream).


Modified: trunk/packages/mgltools/pmv/trunk/debian/patches/fix_string_exceptions.patch
===================================================================
--- trunk/packages/mgltools/pmv/trunk/debian/patches/fix_string_exceptions.patch	2011-06-16 19:52:01 UTC (rev 7048)
+++ trunk/packages/mgltools/pmv/trunk/debian/patches/fix_string_exceptions.patch	2011-06-16 20:02:08 UTC (rev 7049)
@@ -1,12 +1,12 @@
 Description: 'raise exception()' instead of 'raise'
 Author: Piotr Ożarowski <piotr at debian.org>
 Last-Update: 2010-09-12
-Index: mgltools-pmv-1.5.4.cvs.20100912/Pmv/amberCommands.py
+Index: mgltools-pmv-1.5.6~rc1+cvs.20110615/Pmv/amberCommands.py
 ===================================================================
---- mgltools-pmv-1.5.4.cvs.20100912.orig/Pmv/amberCommands.py	2007-12-04 20:25:54.000000000 +0100
-+++ mgltools-pmv-1.5.4.cvs.20100912/Pmv/amberCommands.py	2010-09-12 00:57:10.416550497 +0200
-@@ -1257,7 +1257,7 @@
-         #print 'in updateLabels'
+--- mgltools-pmv-1.5.6~rc1+cvs.20110615.orig/Pmv/amberCommands.py	2011-06-16 00:06:20.166135668 +0200
++++ mgltools-pmv-1.5.6~rc1+cvs.20110615/Pmv/amberCommands.py	2011-06-16 22:00:48.473279633 +0200
+@@ -1244,7 +1244,7 @@
+         print 'in updateLabels'
          if numConstr==None:
              print 'skipping update to None'
 -            raise 'abc'
@@ -14,12 +14,3 @@
              return
          cstr = 'Currently ' + str(numConstr) + ' constrained Atoms'
          for c in [self.vf.minimize_Amber94, self.vf.md_Amber94, self]:
-@@ -2754,7 +2754,7 @@
-         else:
-             msg = res.name + ' has extra atoms '
-             #self.warningMsg(msg)
--            raise msg
-+            raise Exception(msg)
- 
- 
-     def doit(self, nodes):