From e45761f4049a7732242aa9572e3f6d87e60d391c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sat, 4 Aug 2012 14:13:31 -0300
Subject: Be more helpful

---
 librerelease | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'librerelease')

diff --git a/librerelease b/librerelease
index c113572..a03ea98 100755
--- a/librerelease
+++ b/librerelease
@@ -116,7 +116,7 @@ clean_non_packages
 if [ ! -z "${SIGID}" ]; then
     sign_packages
 else
-    error "Package signing is *required*"
+    error "Package signing is *required*, please set SIGID on your libretools.conf"
     exit 1
 fi
 
-- 
cgit v1.2.3-2-g168b


From 7e50ae7becc4ee9b89664a8ec4eca4193cc74482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sat, 4 Aug 2012 14:16:53 -0300
Subject: Only remove synced files, avoids removing packages added by
 librestage during sync

---
 librerelease | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'librerelease')

diff --git a/librerelease b/librerelease
index a03ea98..82a6ab4 100755
--- a/librerelease
+++ b/librerelease
@@ -91,7 +91,7 @@ function clean_non_packages {
 # Clean everything if not on dry-run mode
 function clean {
     [ -z ${dryrun} ] && \
-    find ${WORKDIR}/staging/ -type f -delete
+    rm -f $@
 }
 
 if [ -w / ]; then
@@ -126,6 +126,9 @@ fi
 find ${WORKDIR}/staging -type f -exec chmod 644 {} \;
 find ${WORKDIR}/staging -type d -exec chmod 755 {} \;
 
+# Get the synced files
+SYNCED_FILES=($(find ${WORKDIR}/staging -type f))
+
 msg "Uploading packages..."
 rsync --recursive \
       ${dryrun} \
@@ -144,8 +147,8 @@ rsync --recursive \
           exit 1
       }
 
-msg "Removing packages from local [staging]"
-clean
+msg "Removing ${#SYNCED_FILES[@]} packages from local [staging]"
+clean ${SYNCED_FILES[@]}
 
 msg "Running db-update on repos"
 ssh ${PARABOLAHOST} dbscripts/db-update
-- 
cgit v1.2.3-2-g168b


From 660b32b7bb06d80e81ae7da41efde6f80fd073d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sat, 4 Aug 2012 14:18:50 -0300
Subject: Actually resign when signature failed

---
 librerelease | 2 --
 1 file changed, 2 deletions(-)

(limited to 'librerelease')

diff --git a/librerelease b/librerelease
index 82a6ab4..3820a12 100755
--- a/librerelease
+++ b/librerelease
@@ -66,8 +66,6 @@ function sign_packages {
             if ! gpg --quiet --verify "${package}${SIGEXT}" >/dev/null 2>&1; then
                 error "Failed! Resigning..."
                 rm -f "${package}${SIGEXT}"
-            else
-                continue
             fi
         fi
 
-- 
cgit v1.2.3-2-g168b


From 0a7e0e2866dd5a3b8c794b1aefcec58c15cbe9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Fri, 10 Aug 2012 14:40:31 -0300
Subject: Not all removed files are packages

---
 librerelease | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'librerelease')

diff --git a/librerelease b/librerelease
index 3820a12..c4d97c1 100755
--- a/librerelease
+++ b/librerelease
@@ -145,7 +145,7 @@ rsync --recursive \
           exit 1
       }
 
-msg "Removing ${#SYNCED_FILES[@]} packages from local [staging]"
+msg "Removing ${#SYNCED_FILES[@]} files from local [staging]"
 clean ${SYNCED_FILES[@]}
 
 msg "Running db-update on repos"
-- 
cgit v1.2.3-2-g168b