pld-builder.new: PLD_Builder/chroot.py, PLD_Builder/rpm_builder.py...

[arekm]

Author: arekm                        Date: Sun Feb 25 13:23:38 2007 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Fix order.

---- Files affected:
pld-builder.new/PLD_Builder:
   chroot.py (1.19 -> 1.20) , rpm_builder.py (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/chroot.py
diff -u pld-builder.new/PLD_Builder/chroot.py:1.19 pld-builder.new/PLD_Builder/chroot.py:1.20
--- pld-builder.new/PLD_Builder/chroot.py:1.19	Sun Feb 25 14:14:57 2007
+++ pld-builder.new/PLD_Builder/chroot.py	Sun Feb 25 14:23:33 2007
@@ -39,7 +39,7 @@
     else:
         return r
 
-def cp(file, user = "builder", rm=False, outfile):
+def cp(file, outfile, user = "builder", rm=False):
     f = open(outfile, 'w')
     fileno = f.fileno()
     cmd = "cat %s >&%d" % (file, fileno)

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.43 pld-builder.new/PLD_Builder/rpm_builder.py:1.44
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.43	Sun Feb 25 14:14:57 2007
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Sun Feb 25 14:23:33 2007
@@ -136,7 +136,7 @@
 
     for f in b.files:
         local = r.tmp_dir + os.path.basename(f)
-        chroot.cp(f, rm=True, outfile = local)
+        chroot.cp(f, outfile = local, rm = True)
         ftp.add(local)
 
     def uploadinfo(b):
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/chroot.py?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.43&r2=1.44&f=u