pld-builder.new: PLD_Builder/upgrade.py, PLD_Builder/chroot.py Sup...

[arekm]

Author: arekm                        Date: Thu Sep 15 15:35:23 2005 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Support logging to stdout for run().

---- Files affected:
pld-builder.new/PLD_Builder:
   upgrade.py (1.6 -> 1.7) , chroot.py (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/upgrade.py
diff -u pld-builder.new/PLD_Builder/upgrade.py:1.6 pld-builder.new/PLD_Builder/upgrade.py:1.7
--- pld-builder.new/PLD_Builder/upgrade.py:1.6	Sat Feb 26 23:57:26 2005
+++ pld-builder.new/PLD_Builder/upgrade.py	Thu Sep 15 17:35:18 2005
@@ -66,8 +66,11 @@
             b.log_line("upgrade would need removal of %s" % k)
             return False
     b.log_line("upgrading packages")
-    res = chroot.run("rpm -Fvh %s" % string.join(b.files), user = "root")
-    if res != 0:
+    res = chroot.run("rpm -Fvh %s" % string.join(b.files), user = "root", logstdout = True)
+    if res:
+        for line in res:
+            b.log_line(line)
+    else:
         b.log_line("package upgrade failed")
         return False
     return True

================================================================
Index: pld-builder.new/PLD_Builder/chroot.py
diff -u pld-builder.new/PLD_Builder/chroot.py:1.13 pld-builder.new/PLD_Builder/chroot.py:1.14
--- pld-builder.new/PLD_Builder/chroot.py:1.13	Thu Dec  9 19:09:03 2004
+++ pld-builder.new/PLD_Builder/chroot.py	Thu Sep 15 17:35:18 2005
@@ -21,15 +21,20 @@
     f = os.popen(command(cmd, user), mode)
     return f
     
-def run(cmd, user = "builder", logfile = None):
+def run(cmd, user = "builder", logfile = None, logstdout = False):
     c = command(cmd, user)
     if logfile != None:
-        c = "%s >> %s 2>&1" % (c, logfile)
+        if logstdout:
+            c = "%s 2>&1 | tee %s" % (c, logfile)
+        else:
+            c = "%s >> %s 2>&1" % (c, logfile)
     f = os.popen(c)
-    for l in f.xreadlines():
-        pass
+    lines = f.xreadlines()
     r = f.close()
-    if r == None:
-        return 0
+    if r:
+        if logstdout:
+            return lines
+        else:
+            return r
     else:
-        return r
+        return 0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/upgrade.py?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/chroot.py?r1=1.13&r2=1.14&f=u