- keep buildlogs in spool/builds instead of directly in spool/

Changed files:
    PLD_Builder/build.py -> 1.8
    PLD_Builder/path.py -> 1.13
    admin/fresh-queue.sh -> 1.13

diff --git a/PLD_Builder/build.py b/PLD_Builder/build.py
index 0d263393a1fac8bf04f123d5925f1f027475f0f0..b4385dcbf0c6b1c4468129322248e0a4f96af9b9 100644 (file)
--- a/PLD_Builder/build.py
+++ b/PLD_Builder/build.py
@@ -36,7 +36,7 @@ def run_command(batch):
 def build_all(r, build_fnc):
     status.email = r.requester_email
     notify.begin(r)
-    tmp = path.spool_dir + util.uuid() + "/"
+    tmp = path.build_dir + util.uuid() + "/"
     r.tmp_dir = tmp
     os.mkdir(tmp)
     atexit.register(util.clean_tmp, tmp)

diff --git a/PLD_Builder/path.py b/PLD_Builder/path.py
index a1f30eeaaa3e21c802936d0c15d2c46c9461229c..6f2226e006eb923835c4c3cf8b39bd0caf3b25e8 100644 (file)
--- a/PLD_Builder/path.py
+++ b/PLD_Builder/path.py
@@ -18,6 +18,7 @@ req_queue_file = spool_dir + "req_queue"
 processed_ids_file = spool_dir + "processed_ids"
 buildlogs_queue_dir = spool_dir + "buildlogs/"
 ftp_queue_dir = spool_dir + "ftp/"
+build_dir = spool_dir + "builds/"
 last_req_no_file = spool_dir + "last_req_no"
 got_lock_file = spool_dir + "got_lock"
 log_file = spool_dir + "log"

diff --git a/admin/fresh-queue.sh b/admin/fresh-queue.sh
index 4a8e02529141329dedef0d2a3a56fc8dd0317554..dc089de4badb2ad966a9939d0e0468bd02d7d8c5 100755 (executable)
--- a/admin/fresh-queue.sh
+++ b/admin/fresh-queue.sh
@@ -20,7 +20,7 @@ if [ "$1" != "y" ] ; then
   exit 1
 fi
 
-mkdir -p spool/{buildlogs,ftp} www/srpms lock
+mkdir -p spool/{builds,buildlogs,ftp} www/srpms lock
 echo 0 > www/max_req_no
 echo 0 > spool/last_req_no
 echo -n > spool/processed_ids