[projects/pld-builder.new/new-builddir-new: 20/21] fix cleanup, not to delete RPM's before they are copied ;)

[draenog]

commit b9b4ac1752375fa91bd29d325f620a284b7b9675
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Oct 27 16:28:46 2012 +0200

    fix cleanup, not to delete RPM's before they are copied ;)

 PLD_Builder/request.py     |  2 +-
 PLD_Builder/rpm_builder.py | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/PLD_Builder/request.py b/PLD_Builder/request.py
index 6cbb06f..7104678 100644
--- a/PLD_Builder/request.py
+++ b/PLD_Builder/request.py
@@ -337,7 +337,7 @@ class Batch:
             "--define '_specdir %{_topdir}' "  \
             "--define '_sourcedir %{_specdir}' " \
             "--define '_rpmdir %{_topdir}/RPMS' " \
-            "--define '_builddir %{_specdir}/BUILD' "
+            "--define '_builddir %{_topdir}/BUILD' "
         return rpmdefs + rpmopts
 
     def kernel_string(self):
diff --git a/PLD_Builder/rpm_builder.py b/PLD_Builder/rpm_builder.py
index 81263bd..570d68f 100644
--- a/PLD_Builder/rpm_builder.py
+++ b/PLD_Builder/rpm_builder.py
@@ -250,10 +250,11 @@ def build_rpm(r, b):
                         res = "FAIL_%s" % last_section.upper()
                 b.files = files
 
+    # cleanup tmp and build files
     chroot.run("""
         set -ex;
         chmod -R u+rwX %(topdir)s/BUILD;
-        rm -rf %(topdir)s;
+        rm -rf %(topdir)s/{tmp,BUILD}
     """ % {
         'topdir' : b._topdir,
     }, logfile = b.logfile)
@@ -285,6 +286,14 @@ def build_rpm(r, b):
         chroot.cp(f, outfile = local, rm = True)
         ftp.add(local)
 
+    # cleanup all remains from this build
+    chroot.run("""
+        set -ex;
+        rm -rf %(topdir)s;
+    """ % {
+        'topdir' : b._topdir,
+    }, logfile = b.logfile)
+
     def uploadinfo(b):
         c="file:SRPMS:%s\n" % b.src_rpm
         for f in b.files:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/6fbf8d5befabd83f4260bf17d230d8b32ec42ec2