[pbuilder] 01/01: modules: Exit if keyring already exists

James Clarke jrtc27-guest at moszumanska.debian.org
Thu Sep 8 23:06:01 UTC 2016


This is an automated email from the git hooks/post-receive script.

jrtc27-guest pushed a commit to branch master
in repository pbuilder.

commit 6fbf8665da355da74fee927d00e89b860e74ad9f
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Fri Sep 9 00:05:45 2016 +0100

    modules: Exit if keyring already exists
---
 pbuilder-modules | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pbuilder-modules b/pbuilder-modules
index a9f1ffa..fd78c03 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -804,7 +804,11 @@ function add_additional_aptkeyrings() {
         fi
         dest="${BUILDPLACE}/etc/apt/trusted.gpg.d/${filename}"
         log.i "copying apt key file ${KEY} to ${dest}"
-        cp -n "${KEY}" "${dest}"
+        if [ -f "${dest}" ]; then
+            log.e "file ${dest} already exists"
+            exit 1
+        fi
+        cp "${KEY}" "${dest}"
     done
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/pbuilder.git



More information about the Pbuilder-maint mailing list