Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (90183dbe60efd77eaaae6ac3e4dfdfdfc74cdee5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (90183dbe60efd77eaaae6ac3e4dfdfdfc74cdee5)
  • Date: Thu, 10 Apr 2008 11:15:12 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 1 +
var/lib/sorcery/modules/libgpg | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 90183dbe60efd77eaaae6ac3e4dfdfdfc74cdee5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

* libgpg: fixed gpg_verify_grimoire not liking versioned grimoires
#13461

diff --git a/ChangeLog b/ChangeLog
index c73ef47..007c761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
current variable is empty/unset
* sustained: added some missing basesystem entries and removed the now
nonexistant util-linux-crypto
+ * libgpg: fixed gpg_verify_grimoire not liking versioned grimoires
#13461

2008-04-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libtrack: added find_cache, a function similar to guess_filename for
diff --git a/var/lib/sorcery/modules/libgpg b/var/lib/sorcery/modules/libgpg
index 6ba698b..af13920 100755
--- a/var/lib/sorcery/modules/libgpg
+++ b/var/lib/sorcery/modules/libgpg
@@ -130,7 +130,16 @@ function gpg_verify_grimoire() {

local SOURCE=$(basename $FILENAME)

- test -z $BRANCH && BRANCH=${SOURCE%%.*}
+ if [[ -z $BRANCH ]]; then
+ # deduce the name of the branch from the tarball (stable-rc-0.19.tar.bg2)
+ # asumes double extension (like .tar.gz)
+ # asumes no numbers preceded by a dash in the name
+ # asumes dash as the delimiter between the name and the optional version
+ # asumes version starts with a number
+ BRANCH=${SOURCE%.*}
+ BRANCH=${BRANCH%.*}
+ BRANCH=${BRANCH%-[0-9]*}
+ fi

local gpg_pub_key=$(gpg_get_grimoire_key $BRANCH)
if test -z $gpg_pub_key && test -f $gpg_pub_key ; then



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (90183dbe60efd77eaaae6ac3e4dfdfdfc74cdee5), Jaka Kranjc, 04/10/2008

Archive powered by MHonArc 2.6.24.

Top of Page