Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-1.14 sorcery by Jaka Kranjc (e9b10fe821790ae308b8c6317d8bf07f20dfcf1d)

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 stable-1.14 sorcery by Jaka Kranjc (e9b10fe821790ae308b8c6317d8bf07f20dfcf1d)
  • Date: Mon, 6 Oct 2008 06:06:14 -0500

GIT changes to stable-1.14 sorcery by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

ChangeLog | 54
++++++++++++++++++++++++++++
etc/sorcery/version | 2 -
usr/sbin/cast | 14 ++++---
usr/sbin/cleanse | 10 ++---
usr/share/man/man8/cast.8 | 13 +++++-
var/lib/sorcery/modules/build_api/common | 3 +
var/lib/sorcery/modules/dl_handlers/dl_svn | 4 +-
var/lib/sorcery/modules/dl_handlers/dl_wget | 2 -
var/lib/sorcery/modules/libcast | 9 ++++
var/lib/sorcery/modules/libcrossinstall | 2 -
var/lib/sorcery/modules/libgpg | 9 +++-
var/lib/sorcery/modules/libgrimoire | 8 +++-
var/lib/sorcery/modules/libsorcery | 1
var/lib/sorcery/modules/libstate | 2 -
var/lib/sorcery/modules/libtablet | 2 +
var/lib/sorcery/modules/libtrack | 6 ++-
16 files changed, 118 insertions(+), 23 deletions(-)

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

version: 1.14.2

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

1.14.2-rc5

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

libstate: fixed toggle_depends_status using the newer esc_str;
fixes --recast-optional

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

1.14.2-rc4

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

dl_wget: no-check-certificate hint is applied less liberally #14739

(cherry-picked from commit 5f2d8cd515c258fe0ad716e460ba8411e2297f74)

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

* dl_svn: be verbose when updating too #14770

(cherry-picked from commit 82b43eddbccb1c884e7c345b2e93dc453addab41)

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

made cast --recast-optionals imply -c

(cherry-picked from commit 18956fc416f020c50741a679a96e63fa343c172e)

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

cast, cast.8: mention the need for the -c option with -B and -R

(cherry-picked from commit c90db3ce7e5e8dd25f1bb25deba786f6f5ea93b8)

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

libsorcery: remove the (empty) safe dir at the end of filter()

(cherry-picked from commit a5afffd8189ad23998fded9185c67ef492c59c88)

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

libtrack: add the queuing factors to the volume label of the cache,
to make lookups from caches easier and faster #14723

(cherry-picked from commit 1ba07aa8a06e969385bf879b849d41bb799a148e)

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

libcast: uniq the compile log before copying in create_compile_log
example with my plethora of wine logs:
508091
392282

So it will save a bit of space too. :)

(cherry-picked from commit d21d89ccd570bb26403264847ecc3b67e8d5d434)

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

Revert "* cast: don't resurrect the spell if it needs an update"

too slow the old way

This reverts commit 799a4c25c1b8fe418c18e4aa2b99981750eca4b7.

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

1.14.2-rc3

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

* cast: don't resurrect the spell if it needs an update

(part of d6cc8d753c78ddbd5ecee6ad352e90d7cca718a2)

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

libgpg: added another message suggesting to update sorcery-pubkeys if
things go wrong; it is displayed if the spell needs an update #13752

(cherry-picked from commit 0f5ee4c486741ca954a3c804aebe0d945fa83271)

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

libgrimoire: fixed install_desktop_files for staging

(cherry-picked from commit f4d16e322aa95b4fb78eccc134fce79c48ef65ab)

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

libcrossinstall: fixed a help description for install_root_menu

(cherry-picked from commit 050d5a7f93cf082f0cf8ac6cdeec5496903b60cb)

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

cleanse: simplified a few lines and made the symlink check locale
agnostic

(cherry-picked from commit aa7c9ff21a1dd0fef4f0b4ffb91502aaf35ae744)

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

1.14.2-rc2

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

libtablet: fixed broken repair file handling - a nonexisting tablet
file caused the function to use the previous found tablet file,
sometimes overwritting it with the new repair file

(cherry-picked from commit 299080a80a1db43501b0c4a7e92c539162b7e7a9)

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

1.14.2-rc1

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

libgpg: set LC_ALL=C for commands output of which we parse #14705

(cherry-picked from commit 7aafabba713f654279b7a2a0b7ccf8f9c72170c1)

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

common: remove the doc dir if nothing was installed in gather_docs

(cherry-picked from commit 544ab7b250579f0f751828a5497a195e4a565fc0)

diff --git a/ChangeLog b/ChangeLog
old mode 100644
new mode 100755
index 704edcc..ae4663b
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+2008-10-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * version: 1.14.2 released
+
+2008-10-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libstate: fixed toggle_depends_status using the newer esc_str;
+ fixes --recast-optional
+
+2008-10-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * dl_wget: no-check-certificate hint is applied less liberally #14739
+
+2008-10-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * dl_svn: be verbose when updating too #14770
+
+2008-09-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ made cast --recast-optionals imply -c
+
+2008-09-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * cast, cast.8: mention the need for the -c option with -B and -R
+
+2008-09-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: remove the (empty) safe dir at the end of filter()
+
+2008-09-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtrack: add the queuing factors to the volume label of the cache,
+ to make lookups from caches easier and faster #14723
+
+2008-09-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcast: uniq the compile log before copying in create_compile_log
+
+2008-09-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libgpg: added another message suggesting to update sorcery-pubkeys
if
+ things go wrong; it is displayed if the spell needs an update #13752
+
+2008-09-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libgrimoire: fixed install_desktop_files for staging
+
+2008-09-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcrossinstall: fixed a help description for install_root_menu
+
+2008-09-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * cleanse: simplified a few lines and made the symlink check locale
+ agnostic and single-spaced
+
+2008-09-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtablet: fixed broken repair file handling - a nonexisting tablet
+ file caused the function to use the previous found tablet file,
+ sometimes overwritting it with the new repair file
+
+2008-09-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libgpg: set LC_ALL=C for commands output of which we parse #14705
+
+2008-09-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * common: remove the doc dir if nothing was installed in gather_docs
+
2008-08-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* version: 1.14.1 release!

diff --git a/etc/sorcery/version b/etc/sorcery/version
index 63e799c..a4cc557 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.1
+1.14.2
diff --git a/usr/sbin/cast b/usr/sbin/cast
index fe88027..c79ca7e 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -50,9 +50,13 @@ Optional Parameters:
in the order you wish them to be searched.

-R | --recast-down Recursively recast depended-upon spells, even
- if they are already installed...
--B | --recast-up Recursively recast dependent spells, even
- if they are already installed...
+ if they are already installed. You probably
+ also want to pass the -c flag to make sure
they
+ are recompiled, not resurrected.
+
+-B | --recast-up Recursively recast dependent spells. You
+ probably also want to pass the -c flag to
make
+ sure they are recompiled, not resurrected.

-O | --recast-optional [option] If a spell being built has spells which
could optionally depend on it, but those
@@ -60,7 +64,7 @@ Optional Parameters:
the dependee. Optional parameter can be
option can be one of: "always", "ask-yes",
"ask-no", or "ignore"; it defaults to what
- is set via the sorcery menu.
+ is set via the sorcery menu. Implies -c.

-Z | --lazy-updates [option] Perform updates on installed spells that
need updates. Optional parameter same as
@@ -106,7 +110,7 @@ function process_parameters() {
-R|--recast-down) RECAST_DOWN="$1"; shift 1
;;
-B|--recast-up) RECAST_UP="$1"; shift 1
;;
-O|--recast-optional) get_option "$2" "$DEFAULT_RECAST_OPTIONALS" \
- RECAST_OPTIONALS n
+ RECAST_OPTIONALS n; COMPILE="-c";
shift
$n ;;
-Z|--lazy-updates) get_option "$2" "$DEFAULT_LAZY_DEPENDS_UPDATE" \
LAZY_DEPENDS_UPDATES n
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index 40f195c..9ad4804 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -338,7 +338,7 @@ function prune_depends()
local CANDIDATES=$( find_providers $4 )
provider=""
for spell in $CANDIDATES; do
- if spell_installed $spell || spell_held $spell; then
+ if spell_ok $spell; then
local provider=$spell
break
fi
@@ -701,7 +701,7 @@ function cleanse_fix_find_check() {
return 1;
fi

- local size=$(wc -l $I_LOG | awk '{print $1;}')
+ local size=$(wc -l < $I_LOG)
local count=0

local TMP_I_LOG=$TMP_DIR/${SPELL}/install.log
@@ -867,14 +867,14 @@ function cleanse_fix_sym_check() {
filter_volatiles |
log_adjuster /dev/stdin $TMP_I_LOG filterable root

- local size=$(wc -l $TMP_I_LOG | awk '{print $1;}')
+ local size=$(wc -l < $TMP_I_LOG)
local count=0

while read LINE ; do
progress_bar $count $size 50
# Add this if so 'file' doesn't have to run for everything,
# check that's a symlink first
- if [ -h "$LINE" ] && file "$LINE" | grep "broken symbolic link" ; then
+ if [[ -h $LINE ]] && ! readlink -q -e "$LINE" > /dev/null; then
BADLIST="${BADLIST}${LINE}"$'\n'
fi
let count++
@@ -883,7 +883,7 @@ function cleanse_fix_sym_check() {
clear_line

if [[ $BADLIST ]] ; then
- message "${PROBLEM_COLOR}The following symlinks from " \
+ message "${PROBLEM_COLOR}The following symlinks from" \
"${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}" \
"${PROBLEM_COLOR}don't link to files it installed:" \
"${DEFAULT_COLOR}"
diff --git a/usr/share/man/man8/cast.8 b/usr/share/man/man8/cast.8
old mode 100644
new mode 100755
index f22343d..527de38
--- a/usr/share/man/man8/cast.8
+++ b/usr/share/man/man8/cast.8
@@ -65,15 +65,24 @@ Forces redownloading of sources, sources are freshly
downloaded
even when we already have them.
.SS "-R, --recast-down"
recasts all the spells the given spell(s) depend on
-(and the ones they depend on ...).
+(and the ones they depend on ...). You probably also want to specify
+.IR "-c"
+to make sure they are recompiled and not resurrected.
This might be quite a lot of spells.
+
.SS "-B, --recast-up"
recasts all the spells that depend on the given spell(s)
-(and the ones they depend on ...).
+(and the ones they depend on ...). You probably also want to specify
+.IR "-c"
+to make sure they are recompiled and not resurrected.
+
.SS "-O, --recast-optional [option]"
If a spell being built has spells which could optionally depend on it, but
those
dependencies are disabled, ask to recast the dependee. Option can be one of:
"always",
"ask-yes", "ask-no", or "ignore"; it defaults to what is set via the sorcery
menu.
+Implies
+.IR "-c" .
+
.SS "-Z, --lazy-updates [option]"
Perform updates on installed spells that need updates. Optional parameter
are the same as above.
.SS "-b, --force-base-dep"
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 211e150..f3295fe 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -194,6 +194,9 @@ function real_gather_docs() { (
# making installed docs readable for all users.
chmod -fR a+r $DEST_DIR

+ # remove the doc dir if nothing was installed
+ rmdir $DEST_DIR 2> /dev/null
+
fi

) }
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_svn
b/var/lib/sorcery/modules/dl_handlers/dl_svn
index c9e8a76..cd71806 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_svn
+++ b/var/lib/sorcery/modules/dl_handlers/dl_svn
@@ -48,8 +48,8 @@ function dl_svn_get () {

if test -d $target; then
message "${MESSAGE_COLOR}Running svn update...${DEFAULT_COLOR}"
- echo svn update $svn_args -q --non-interactive -r $SVN_TAG $target
- svn update $svn_args -q --non-interactive -r $SVN_TAG $target
+ echo svn update $svn_args --non-interactive -r $SVN_TAG $target
+ svn update $svn_args --non-interactive -r $SVN_TAG $target
rc=$?
eval "$dl_target=\"$target\""
else
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_wget
b/var/lib/sorcery/modules/dl_handlers/dl_wget
index 216154a..27e5f1f 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_wget
+++ b/var/lib/sorcery/modules/dl_handlers/dl_wget
@@ -117,7 +117,7 @@ function dl_wget_set_options() {
fi

local check_certificate
- if list_find "$hints" no-check-certificate; then
+ if list_find "$hints" no-check-certificate && [[ $(url_get_prefix "$URL")
== https ]]; then
check_certificate=--no-check-certificate
fi

diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index f17d884..5ba604c 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -624,6 +624,7 @@ function acquire_cast_lock() {
## our compile log directory.
#---------------------------------------------------------------------
function create_compile_log() {
+ local tmp_log=$C_LOG.2

message "${MESSAGE_COLOR}Creating compile log" \
"${FILE_COLOR}$COMPILE_LOGS/$SPELL-$VERSION$EXTENSION" \
@@ -632,11 +633,19 @@ function create_compile_log() {
echo "---config.log---" >> $C_LOG
cat $SOURCE_DIRECTORY/config.log >> $C_LOG
fi
+
+ # remove any nplicated lines (happens due to all the redirection we do)
+ uniq $C_LOG > $tmp_log
+ mv $tmp_log $C_LOG
+
+ # install the compile log
if [ -z "$EXTENSION" ]; then
cp $C_LOG $COMPILE_LOGS/$SPELL-$VERSION
else
$COMPRESSBIN -f < $C_LOG > $COMPILE_LOGS/$SPELL-$VERSION$EXTENSION
fi
+
+ # install the castfs log
if [[ $STAGED_INSTALL == on ]] ; then
message "${MESSAGE_COLOR}Creating castfs debug log" \

"${FILE_COLOR}$COMPILE_LOGS/$SPELL-$VERSION.castfs.dbglog$EXTENSION" \
diff --git a/var/lib/sorcery/modules/libcrossinstall
b/var/lib/sorcery/modules/libcrossinstall
index 2c3f179..e184e70 100755
--- a/var/lib/sorcery/modules/libcrossinstall
+++ b/var/lib/sorcery/modules/libcrossinstall
@@ -17,7 +17,7 @@
function install_root_menu() {

debug "libcrossinstall" "cross_install_menu is being built now..."
- local C_HELP="Fill in your own preferred track root location."
+ local C_HELP="Fill in your own preferred install cache location."
local I_HELP="Fill in your own preferred install root location."
local S_HELP="Fill in your own preferred state root location."
local T_HELP="Fill in your own preferred track root location."
diff --git a/var/lib/sorcery/modules/libgpg b/var/lib/sorcery/modules/libgpg
index 7373daf..5cefac8 100755
--- a/var/lib/sorcery/modules/libgpg
+++ b/var/lib/sorcery/modules/libgpg
@@ -52,7 +52,7 @@ function gpg_verify_signature() { # $1 sig $2 file $3
pubring $4 algo var
return 200
else
local output=$TMP_DIR/$(basename $file).gpgout
- gpg --no-default-keyring \
+ LC_ALL=C gpg --no-default-keyring \
--always-trust \
--keyring $keyring \
--batch \
@@ -301,6 +301,9 @@ function gpg_user_query() {
message "${MESSAGE_COLOR}gpg verification is disabled${DEFAULT_COLOR}"
else
message "${PROBLEM_COLOR}Failure to verify gpg signature${DEFAULT_COLOR}"
+ if does_spell_need_update sorcery-pubkeys; then
+ message "It looks like casting sorcery-pubkeys may help."
+ fi
case "$3" in
grimoire)
if list_find "$GPG_GRIMOIRE_LIST" $2 > /dev/null 2>&1 ; then
@@ -336,7 +339,7 @@ function gpg_user_query() {
function gpg_hashsum() {
local algorithm=$1
local file=$2
- gpg --print-md "$algorithm" "$file"| tr -d '\n ' |cut -f2 -d:|
+ LC_ALL=C gpg --print-md "$algorithm" "$file"| tr -d '\n ' |cut -f2 -d:|
tr 'A-F' 'a-f'|tr -d '\n'
echo " $file"
}
@@ -348,7 +351,7 @@ function gpg_hashsum() {
## This assumes the caller has already verified that gpg is installed.
#---------------------------------------------------------------------
function gpg_get_hashes() {
- gpg --version 2> /dev/null | grep '^Hash' | awk -F: '{ print $2 }' | tr ,
' ' | tr 'A-Z' 'a-z'
+ LC_ALL=C gpg --version 2> /dev/null | grep '^Hash' | awk -F: '{ print $2
}' | tr , ' ' | tr 'A-Z' 'a-z'
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index a6594df..cd54495 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -169,10 +169,16 @@ function make() {
function install_desktop_files() {
debug "libgrimoire" "Running install_desktop_files() on $SPELL"
local each file
- local target_dir="/usr/share/applications"
+ local target_dir
local desktop_dir="$SCRIPT_DIRECTORY/desktop"
test -d $desktop_dir || return 0

+ if [[ $STAGED_INSTALL == off ]]; then
+ target_dir="$INSTALL_ROOT/usr/share/applications"
+ else
+ target_dir="$STAGE_DIRECTORY/TRANSL/usr/share/applications"
+ fi
+
mkdir -p $target_dir
for each in $(find $desktop_dir -maxdepth 1 -type f); do
file=$(basename $each)
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 70440b5..f7b5a19 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -531,6 +531,7 @@ function filter() {
else
cat
fi
+ rmdir $TMP_SSF 2>/dev/null
else
cat
fi
diff --git a/var/lib/sorcery/modules/libstate
b/var/lib/sorcery/modules/libstate
index 12ed59a..0389c96 100755
--- a/var/lib/sorcery/modules/libstate
+++ b/var/lib/sorcery/modules/libstate
@@ -237,7 +237,7 @@ function toggle_depends_status() {
shift

local spell dependency
- esc_str "$1" spell; esc_str "$2" dependency
+ spell=$(esc_str "$1"); dependency=$(esc_str "$2")

local t_status
lock_start_transaction "$depends_status" t_status
diff --git a/var/lib/sorcery/modules/libtablet
b/var/lib/sorcery/modules/libtablet
index 32d4169..08729dd 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -644,6 +644,7 @@ function tablet_import_repair_files_page() {
function tablet_check_repair_file() {
local type=$1
local replace=0
+ local tablet_file

if ! [[ "$loaded" ]] ; then
tablet_get_version "$page" spell_version
@@ -676,6 +677,7 @@ function tablet_check_repair_file() {
replace=2
fi
fi
+
if [[ $replace == 1 ]] ||
{ [[ $replace == 2 ]] && [[ $codex_md5 != $tablet_md5 ]] ; } ; then
message "${MESSAGE_COLOR}Tablet Repair: replacing${DEFAULT_COLOR}"
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index c9a2aa9..9e9a29b 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -354,6 +354,10 @@ function create_cache_archive() {

message "${MESSAGE_COLOR}Creating cache file" \
"${FILE_COLOR}${CACHE_COMP}${DEFAULT_COLOR}"
+ # gather the queuing factors, so we can include them in the label, saving
us the
+ # need to compute the spell name and a few untars when dealing with just a
cache
+ local label
+ label="$SPELL ${VERSION:-0} ${PATCHLEVEL:-0} ${SECURITY_PATCH:-0}
${UPDATED:-0}"

local TMP_DATA=$TMP_DIR/foo.data
local TMP_MDATA=$TMP_DIR/foo.mdata
@@ -361,7 +365,7 @@ function create_cache_archive() {

pushd $STATE_ROOT/ &>/dev/null
install_log_filter $STATE_ROOT "." < $TMP_MDATA |
- tar --no-recursion -cPf "$CACHE" -T -
+ tar --no-recursion -cPf "$CACHE" -V "$label" -T -
popd &>/dev/null

pushd $INSTALL_ROOT/ &>/dev/null



  • [SM-Commit] GIT changes to stable-1.14 sorcery by Jaka Kranjc (e9b10fe821790ae308b8c6317d8bf07f20dfcf1d), Jaka Kranjc, 10/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page