Rev 205: Wrapped long lines. in http://bzr.daniel-watkins.co.uk/pqm/abstract-patch

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/abstract-patch

------------------------------------------------------------
revno: 205
revision-id: daniel at daniel-watkins.co.uk-20080722172630-kumd4al0u7eaum6b
parent: daniel at daniel-watkins.co.uk-20080722171533-4i9swhj7tkadfz2n
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: abstract-patch
timestamp: Tue 2008-07-22 18:26:30 +0100
message:
  Wrapped long lines.
-------------- next part --------------
=== modified file 'pqm/script.py'
--- a/pqm/script.py	2008-07-20 13:43:21 +0000
+++ b/pqm/script.py	2008-07-22 17:26:30 +0000
@@ -734,18 +734,26 @@
         filenames = []
         for line in content:
             if line[0:4] in ('+++ ', '--- '):
-                # We intentionally include the date, etc - stripping it out is too hard and error-prone
+                # We intentionally include the date, etc - stripping it out
+                # is too hard and error-prone
                 filenames.insert(0, line[4:].strip())
         for filename in filenames:
             if (filename.find('/..') > 0) or (filename.find('../') > 0):
-                raise PQMException(self.sender, "Invalid backreferencing filename in patch: %s", filename)
+                msg = "Invalid backreferencing filename in patch: %s"
+                raise PQMException(self.sender, msg, filename)
             elif filename[0] == '/':
-                raise PQMException(self.sender, "Invalid absolute filename in patch: %s", filename)
+                msg = "Invalid absolute filename in patch: %s"
+                raise PQMException(self.sender, msg, filename)
         fd = self.write_lines_to_fd(content)
-        (status, msg, output) = popen_noshell_with_input(gnupatch_path, fd, '-p1', '--batch', '--no-backup-if-mismatch')
+        status, msg, output = \
+            popen_noshell_with_input(gnupatch_path, fd, '-p1', '--batch',
+                                     '--no-backup-if-mismatch')
         os.close(fd)
         if not ((status is None) or (status == 0)):
-            raise PQMException(self.sender, ["patch command \"%s\" failed (%s): %s" % (gnupatch_path, status, msg)] + output)
+            msg = "patch command \"%s\" failed (%s): %s" % (gnupatch_path,
+                                                            status,
+                                                            msg)
+            raise PQMException(self.sender, [msg] + output)
         return (summary, output)
 
     def write_lines_to_fd(self, lines):