From: Eric S. Raymond <esr@thyrsus.com>
Date: Fri, 13 Jul 2007 14:02:57 +0000 (+0000)
Subject: Minor bug fixes.
X-Git-Tag: 1.4~5
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=1ace2559dd09b056d6a1f8d35f1b061bde4ab808;p=sccs2rcs.git

Minor bug fixes.
---

diff --git a/sccs2rcs b/sccs2rcs
index 9994bf3..0113bcc 100755
--- a/sccs2rcs
+++ b/sccs2rcs
@@ -298,6 +298,8 @@ if __name__ == '__main__':
                     deltalines.pop(0)
                     if deltalines[0].startswith("COMMENTS"):
                         break
+                while not deltalines.strip():
+                    deltalines.pop(0)
                 deltamsg = deltalines.join("\n")
                 cmd = 'ci -f -r%s -d"%s" -w%s %s' % (rev, date, author, stem)
                 # FIXME: output of this command isn't logged
@@ -309,7 +311,7 @@ if __name__ == '__main__':
                 except OSError:
                     die("RCS checkin of delta failed")
         # We're done
-	logtext += get_output_or_die("unget " + sccsmaster(stem))
+	get_output_or_die("unget " + sccsmaster(stem))
 
     # Replace all files for which there exist SCCS masters,
     progress("replacing workfiles...")