From: Eric S. Raymond <esr@thyrsus.com>
Date: Fri, 13 Jul 2007 12:42:13 +0000 (+0000)
Subject: This version gets the logging right.
X-Git-Tag: 1.4~9
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=ed53e3f83cbf843d5a0b9e338db6da3c13f3c8f4;p=sccs2rcs.git

This version gets the logging right.
---

diff --git a/sccs2rcs b/sccs2rcs
index 586fde1..a697e75 100755
--- a/sccs2rcs
+++ b/sccs2rcs
@@ -104,8 +104,8 @@ def sccsfile(f):
 
 def progress(msg):
     global logtext
-    msg = "sccs2rcs: " + msg + "\n"
-    logtext += msg 
+    msg = "sccs2rcs: " + msg
+    logtext += msg + "\n"
     print msg
 
 def get_output(command):
@@ -133,7 +133,8 @@ Original unchanged history in ./SCCS.
     sys.exit(1)
 
 def warn(msg):
-    msg = "sccs2rcs: warning, "
+    global logtext
+    msg = "sccs2rcs: warning, " + msg
     logtext += msg + "\n" 
     print >>sys.stderr, msg
 
@@ -230,7 +231,7 @@ if __name__ == '__main__':
             progress("==> file %s, rev=%s, date=%s, author=%s" \
                   % (file, rev, rcsdate, author)) 
             get_output_or_die("get -e -r%s SCCS/s.%s" % (rev, file))
-            print "checked out of SCCS"
+            progress("checked out of SCCS")
 
             # replace SCCS keywords with RCS keywords
             try: