stg files: Don't write just an empty line

If we don't produce any output, we shouldn't print a newline.

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/files.py b/stgit/commands/files.py
index 46d43c150a58ce7919a4958e423a11d9306fca0a..84925afc5b3eab71242a9cf3b9a12549a4d6e50e 100644 (file)
--- a/stgit/commands/files.py
+++ b/stgit/commands/files.py
@@ -59,9 +59,12 @@ def func(parser, options, args):
     rev2 = git_id(crt_series, '%s' % patch)
 
     if options.stat:
     rev2 = git_id(crt_series, '%s' % patch)
 
     if options.stat:

-        out.stdout_raw(gitlib.diffstat(git.diff(rev1 = rev1, rev2 = rev2)) + '\n')
+        output = gitlib.diffstat(git.diff(rev1 = rev1, rev2 = rev2))

     elif options.bare:
     elif options.bare:

-        out.stdout_raw(git.barefiles(rev1, rev2) + '\n')
+        output = git.barefiles(rev1, rev2)

     else:
     else:

-        out.stdout_raw(git.files(rev1, rev2, diff_flags = options.diff_flags)
-                       + '\n')
+        output = git.files(rev1, rev2, diff_flags = options.diff_flags)
+    if output:
+        if not output.endswith('\n'):
+            output += '\n'
+        out.stdout_raw(output)