Merge branch 'master' into newroot

Conflicts:
	treepkg

1 files changed, 7 insertions, 6 deletions

diff --git a/librerelease b/librerelease
index c113572..c4d97c1 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
 
@@ -91,7 +89,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
@@ -116,7 +114,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
 
@@ -126,6 +124,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 +145,8 @@ rsync --recursive \
           exit 1
       }
 
-msg "Removing packages from local [staging]"
-clean
+msg "Removing ${#SYNCED_FILES[@]} files from local [staging]"
+clean ${SYNCED_FILES[@]}
 
 msg "Running db-update on repos"
 ssh ${PARABOLAHOST} dbscripts/db-update