diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2009-01-07 20:31:53 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2009-01-07 20:31:53 +0000 |
| commit | 91bf3fbd2eedd90410cc9bab13adc9cc929ee330 (patch) | |
| tree | 23e3755a33971ff5099616104a5333b6a9d929bc /trunk/src | |
| parent | df5f50c5f35d359a9ee4088c2467df3cab06d94b (diff) | |
| download | simplepkg-91bf3fbd2eedd90410cc9bab13adc9cc929ee330.tar.gz simplepkg-91bf3fbd2eedd90410cc9bab13adc9cc929ee330.tar.bz2 | |
attempting to fix 49
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@739 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src')
| -rw-r--r-- | trunk/src/createpkg | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/trunk/src/createpkg b/trunk/src/createpkg index c1b2c77..7b23f48 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -57,6 +57,8 @@ ${red}DESCRIPTION${normal} commit changes to binary packages' repository ${red}--status${normal} check binary packages' svn repository status + ${red}--update-keyring${normal} + update GPG-KEY from binary repositories ${red}-h${normal}, ${red}--help${normal} show this help @@ -589,6 +591,14 @@ case $1 in repository_status exit $EXIT_CODE ;; + '--update-keyring') + get_sign_packages_user + repo_gpg_key $PACKAGES_DIR --update + if [ $PACKAGES_REPOS_NOARCH -eq $on ]; then + repo_gpg_key $NOARCH_DIR --update + fi + exit $EXIT_CODE + ;; *) if [ "${1:0:1}" != "-" ]; then PACKAGE="$1" @@ -722,18 +732,7 @@ if [ $SIGN_PACKAGES -eq $on ]; then echo "Signing package..." - check_gnupg $SIGN_PACKAGES_USER - - if [ ! -z "$SIGN_PACKAGES_KEYID" ]; then - SIGN_KEYID="$SIGN_PACKAGES_KEYID" - else - if [ ! -z "$SIGN_PACKAGES_USER" ]; then - SIGN_KEYID="`su $SIGN_PACKAGES_USER -c \ - "gpg --list-secret-keys --with-colons | grep ^sec | head -n 1 | cut -d : -f 5 | sed 's/^.*\(.\{8\}\)$/\1/'"`" - else - SIGN_KEYID="`gpg --list-secret-keys --with-colons | grep ^sec | head -n 1 | cut -d : -f 5 | sed 's/^.*\(.\{8\}\)$/\1/'`" - fi - fi + get_sign_packages_user if [ ! -z "$SIGN_PACKAGES_USER" ]; then tmp_sign_folder="`mktemp -d $TMP/createpkg_sign.XXXXXX`" |