[csw-devel] SF.net SVN: gar:[12031] csw/mgar/gar/v2/lib/python/package.py

[wahwah at users.sourceforge.net]

Revision: 12031
          http://gar.svn.sourceforge.net/gar/?rev=12031&view=rev
Author:   wahwah
Date:     2010-12-20 11:55:48 +0000 (Mon, 20 Dec 2010)

Log Message:
-----------
comparepkg: Don't display extra newlines

Difflib returns some lines with return characters, let's strip them off.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/package.py

Modified: csw/mgar/gar/v2/lib/python/package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package.py	2010-12-20 11:55:17 UTC (rev 12030)
+++ csw/mgar/gar/v2/lib/python/package.py	2010-12-20 11:55:48 UTC (rev 12031)
@@ -458,7 +458,7 @@
                                    sorted(pkgmap_b.paths),
                                    fromfile=self.pkg_a.pkg_path,
                                    tofile=self.pkg_b.pkg_path)
-    diff_text = "\n".join(diff_ab)
+    diff_text = "\n".join(x.strip() for x in diff_ab)
     if diff_text:
       less_proc = subprocess.Popen(["less"], stdin=subprocess.PIPE)
       less_stdout, less_stderr = less_proc.communicate(input=diff_text)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.