Skip to Content.
Sympa Menu

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

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 (47d6f1d68b3525d540bb47b73ea93523d9fadb0e)
  • Date: Thu, 10 Apr 2008 09:57:17 -0500

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

ChangeLog | 7 +++++++
var/lib/sorcery/modules/libgpg | 6 +++---
var/lib/sorcery/modules/libresurrect | 7 ++++---
var/lib/sorcery/sustained | 9 ++++++++-
4 files changed, 22 insertions(+), 7 deletions(-)

New commits:
commit 47d6f1d68b3525d540bb47b73ea93523d9fadb0e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

* sustained: added some missing basesystem entries and removed the now
nonexistant util-linux-crypto

commit ed9faae11dd470507837ff5e251848e68b2c93f6
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

* libressurect, libgpg: fixed some comments and error messages
* libressurect: fallback to the variable's contents, not its name if
the
current variable is empty/unset

diff --git a/ChangeLog b/ChangeLog
index 7a993da..c73ef47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libressurect, libgpg: fixed some comments and error messages
+ * libressurect: fallback to the variable's contents, not its name if
the
+ current variable is empty/unset
+ * sustained: added some missing basesystem entries and removed the now
+ nonexistant util-linux-crypto
+
2008-04-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libtrack: added find_cache, a function similar to guess_filename for
finding caches from part of their name
diff --git a/var/lib/sorcery/modules/libgpg b/var/lib/sorcery/modules/libgpg
index 91b6fe8..6ba698b 100755
--- a/var/lib/sorcery/modules/libgpg
+++ b/var/lib/sorcery/modules/libgpg
@@ -104,11 +104,11 @@ function gpg_get_grimoire_key() {
## Verify a grimoire tarball's gpg signature
## @param file on local disk to verify
## @param url from which to get the signature
-## @param (optional) grimoire branch, if derive it from the filename with
${SOURCE%%*.}
+## @param (optional) grimoire branch, if empty derive it from the filename
with ${SOURCE%%.*}
## @param (optional) signature file, if empty download $SOURCE.$GPG_SIG_EXT
from $2
## @return 0 on success, non-zero on failure:
## @return 1 verification failed
-## @return 2 verification is disabled
+## @return 201 verification is disabled
## @return 254 no keyring found
## @return 255 could not download signature
## @return anything else see gpg_verify_signature
@@ -256,7 +256,7 @@ function gpg_verify_common() {
url_download "$SIG_FILE" "$SIG_URL" "file" gpg_target gpg_type &&
[[ $gpg_type == file ]] ||
{
- message "Failed to get gpg signature! verification is impossible"
+ message "Failed to get gpg signature! verification is impossible!"
return 255
}
[[ "$gpg_target" != $SIG_FILE ]] && mv "$gpg_target" "$SIG_FILE"
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index 715f7d8..c977e81 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -198,10 +198,11 @@ function resurrect() { (
SPELL_CONFIG_FILTER=$SCRIPT_DIRECTORY/configs
SECTION_CONFIG_FILTER=$SECTION_DIRECTORY/configs
GRIMOIRE_CONFIG_FILTER=$GRIMOIRE/configs
- # loading the spell may give us a different version which we dont want
fi
local CONFIG_FILTERS="$GRIMOIRE_CONFIG_FILTER $SECTION_CONFIG_FILTER
$SPELL_CONFIG_FILTER"
- VERSION=${VERSION:-TMP_VERSION}
+ # loading the spell may give us a different version which we dont want
+ # TODO: check if the below line should be inversed wrt the previous comment
+ VERSION=${VERSION:-$TMP_VERSION}

# 6) find the cache's install log and divide it up every way imaginable
if ! [[ $OLD_TABLET_DIR ]] ; then
@@ -213,7 +214,7 @@ function resurrect() { (
else
local NEW_INSTALL_LOG=${INSTALL_LOGS#$STATE_ROOT/}/$SPELL-$VERSION
test -f $NEW_INSTALL_LOG || {
- message "No install log found in unpacked cache, expected $INSTALL_LOG"
+ message "No install log found in unpacked cache, expected
$NEW_INSTALL_LOG"
resurrect_fail
return 1
}
diff --git a/var/lib/sorcery/sustained b/var/lib/sorcery/sustained
index af4f5ea..d35b8b2 100755
--- a/var/lib/sorcery/sustained
+++ b/var/lib/sorcery/sustained
@@ -4,6 +4,7 @@ bzip2
coreutils
cpio
dialog
+diffutils
e2fsprogs
file
findutils
@@ -11,11 +12,16 @@ gawk
gcc
gettext
glibc
+gnupg
grep
gzip
+iana-etc
+ifupdown
init.d
installwatch
less
+locale
+make
module-init-tools
nano
ncurses
@@ -26,12 +32,13 @@ readline
sed
shadow
simpleinit-msb
+smgl-archspecs
+smgl-fhs
smgl-strip
smgl-prelink
tar
texinfo
unzip
util-linux
-util-linux-crypto
wget
zlib



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

Archive powered by MHonArc 2.6.24.

Top of Page