Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (60fece67f8083aa0ad15f372945ced46e7ae2792)

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 test-1.14 sorcery by Jaka Kranjc (60fece67f8083aa0ad15f372945ced46e7ae2792)
  • Date: Fri, 6 Jun 2008 11:10:44 -0500

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

ChangeLog | 27 ++++++++++++++++++++++++
etc/sorcery/config | 2 -
etc/sorcery/version | 2 -
usr/sbin/gaze | 2 -
usr/sbin/scribe | 2 -
usr/sbin/sorcery | 9 +-------
var/lib/sorcery/modules/libcast | 5 ++--
var/lib/sorcery/modules/libdepends | 40
++++++++++++++++++++++++++++++++-----
var/lib/sorcery/modules/libsorcery | 4 +--
9 files changed, 73 insertions(+), 20 deletions(-)

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

1.14.1-rc2

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

config: use $HOME instead of hardcoding /root

(cherry-picked from commit 62166f95666f6909203e19c2a3e93ab5bc150c95)

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

libcast: made the optional dependency on xinetd suggested and changed two
comments

(cherry-picked from commit c0ec9587ebc8afca4748c68a32e7c41be699fe05)

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

scribe: fixed case in scribe update message

(cherry-picked from commit 89c198d03af9994ca4666b0d5b539ebcf97cafef)

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

fixed CCACHE and STORE_CONF_LOG not being disablable

(cherry-picked from commit 4d7fd5827a997f12616cddc1d158af541109e3a6)

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

sorcery: sanitized the saving of CCACHE in the feature_menu

(cherry-picked from commit b7773d3b233cb4563cef6d7237e93a1e37bb0bac)

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

change tee to sed p in clean_logs, it didn't work nicely for Vlad

(cherry-picked from commit 7c2d6782cf168d294de09adbeeec88a94371c3b7)

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

libsorcery: removed a use of hardcoded $INSTALL_CACHE

(cherry-picked from commit 8f5eb2776d19eab74a904cda03abdae64384f0c3)

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

libdepends: when falling back to installed spells as default choices for
providers, try to use the currently used provider; added a warning

(cherry-picked from commit 559b978b88ba20e02033179cedcd64aca6609803)

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

libdepends: change an echo | grep to real_list_find
an irrelevant commit to ease the integration of the next one

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

* gaze: don't show find errors when searching for aliens

(cherry-picked from commit bfdbd0607a25439427611f682d77b4eae8f1c632)

diff --git a/ChangeLog b/ChangeLog
index ce155f8..f583074 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2008-05-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * config: use $HOME instead of hardcoding /root
+
+2008-04-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcast: made the optional dependency on xinetd suggested and
changed two
+ comments
+
+2008-04-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * scribe: fixed case in scribe update message
+
+2008-04-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * sorcery: sanitized the saving of CCACHE in the feature_menu
+ fixed CCACHE and STORE_CONF_LOG not being disablable
+
+2008-04-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ change tee to sed p in clean_logs, it didn't work nicely for Vlad
+
+2008-04-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: removed a use of hardcoded $INSTALL_CACHE
+
+2008-04-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdepends: when falling back to installed spells as default
choices for
+ providers, try to use the currently used provider; added a warning
+
+2008-04-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gaze: don't show find errors when searching for aliens
+
2008-04-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
times faster; made it also echo castfs logs and echo absolute paths
rewrote clean_logs to be more slick and as a result a lot faster
diff --git a/etc/sorcery/config b/etc/sorcery/config
index 536136b..db1fdb4 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -87,7 +87,7 @@
SM_CONFIG_OPTION_CACHE=/etc/sorcery/local/config_option_cache
GROUP_LIST=/etc/sorcery/groups
GRIMOIRE_LIST=/etc/sorcery/local/grimoire
GRIMOIRE_LIST_BACKUP=/etc/sorcery/local/grimoire.backup
- RESTORE_SCRIPT=/root/sorcery.restore
+ RESTORE_SCRIPT=$HOME/sorcery.restore
CABAL_DIRECTORY=/etc/sorcery/cabal
CABAL_NAMES=$CABAL_DIRECTORY/names
CABAL_KEYS=$CABAL_DIRECTORY/keys
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 29a1349..cdd5896 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.1-rc1
+1.14.1-rc2
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 471fc0a..6a064e7 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -264,7 +264,7 @@ function alien() {

[[ $GAZE_VERBOSE != 0 ]] &&
message "Discovering ambient files..."
- find $GAZE_ALIEN_PATHS | files | filter "$EXCLUDED" | sort
>$TMP_DIR/gaze.found
+ find $GAZE_ALIEN_PATHS 2>/dev/null | files | filter "$EXCLUDED" | sort
>$TMP_DIR/gaze.found

diff -B -a -d $TMP_DIR/gaze.found $TMP_DIR/gaze.known |
grep -v "^> " |
diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index 950bd63..7afdfcb 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -314,7 +314,7 @@ function scribe_add_update_worker() {
message "Grimoire \"$grimoire\" successfully added to your codex."
else
scribe_reindex $grimoire
- message "$grim_name Updated!"
+ message "$grim_name updated!"
grimoire_history $grimoire
fi

diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 2b05a7a..3cbb914 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -1594,7 +1594,7 @@ PER_SPELL_CFLAGS=${PER_SPELL_CFLAGS:-off}
"SCREEN" "Toggle" "$SCREEN" "$SCR_HELP" \
"PER_SPELL_CFLAGS" "Toggle" "$PER_SPELL_CFLAGS" "$PSC_HELP"'`
then
- TEMP=(ARCHIVE AUTOFIX UPDATEFIX AUTOPRUNE COLOR GATHER_DOCS MAIL_REPORTS
VIEW_REPORTS PRESERVE SUSTAIN TMPFS VOYEUR REAP NET_SELECT CONFIG_LOC
CLEAN_SOURCE CROSS_INSTALL SET_TERM_TITLE SCREEN PER_SPELL_CFLAGS)
+ TEMP=(ARCHIVE AUTOFIX UPDATEFIX AUTOPRUNE CCACHE COLOR CONFIG_LOC
GATHER_DOCS MAIL_REPORTS PRESERVE SUSTAIN TMPFS VIEW_REPORTS VOYEUR REAP
STORE_CONF_LOG NET_SELECT CLEAN_SOURCE CROSS_INSTALL SET_TERM_TITLE SCREEN
PER_SPELL_CFLAGS)
for i in ${TEMP[*]} ; do
eval $i=off
done
@@ -1635,12 +1635,7 @@ PER_SPELL_CFLAGS=${PER_SPELL_CFLAGS:-off}
done

modify_local_config "color" "$COLOR" "command"
-
- TEMP=`cat $LOCAL_COMPILE_CONFIG |
- grep -v "CCACHE="`
-
- echo "$TEMP" > $LOCAL_COMPILE_CONFIG
- echo "CCACHE=$CCACHE" >> $LOCAL_COMPILE_CONFIG
+ modify_config $LOCAL_COMPILE_CONFIG CCACHE $CCACHE
fi

}
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 728d1da..d9e6bfb 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -169,7 +169,7 @@ function query_custom_cflags() {
#---------------------------------------------------------------------
## Asks the user about init and xinetd services
##
-## expcetd $SCRIPT_DIRECTORY to be setable, any file one level deep in
+## expects $SCRIPT_DIRECTORY to be setable, any file one level deep in
## $SCRIPT_DIRECTORY/xinetd.d or $SCRIPT_DIRECTORY/init.d is assumed to be
## a service
##
@@ -354,7 +354,7 @@ function query_services() {
fi

if [[ $XINETD_INSTALLED ]] ; then
- optional_depends xinetd "" "" "for $XINETD_INSTALLED"
+ suggest_depends xinetd "" "" "for $XINETD_INSTALLED"
fi
}

@@ -522,6 +522,7 @@ function install_xinetd_sub() {

set_xinetd_state $tmp_file $state

+ # FIXME use install_config_file?
if test -e $inst_file &&
! grep -v disable $inst_file|diff - $file &>/dev/null ; then
message "${QUERY_COLOR}$inst_file differs from the default $file," \
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index 44f5a1f..2024044 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -952,10 +952,22 @@ function work_depends_provider()
fi

# check if theres a provider already installed
+ # if there are multiple, try to select the previously used one
if [[ ! $default ]]; then
for tmp in $CANDIDATES; do
- spell_ok $tmp && default=$tmp && break
+ spell_ok $tmp && real_list_add choices $tmp
done
+ if [[ $choices == ${choices##* } ]]; then
+ default=$choices
+ else
+ explode "$(search_depends_status $DEPENDS_STATUS "$SPELL" ".*($1)")"
":" "status"
+ local old_provider=${status[1]%(*} # Name of spell which provides $1
+ if real_list_find "$choices" $old_provider; then
+ default=$old_provider
+ else
+ default=${choices%% *}
+ fi
+ fi
fi

select_provider "provider" "$default" 0 $CANDIDATES
@@ -1003,7 +1015,7 @@ function work_optional_depends_provider()
{

debug "libdepends" "$FUNCNAME - $@"
- local default tmp installed=no
+ local default tmp choices installed=no
local status=()

local failure_ok=$1
@@ -1061,8 +1073,13 @@ function work_optional_depends_provider()
# if the user said "on" use the default rather than none
# unless theres something wrong with the provider they chose
# in which case fall back to none
- [[ $tmp ]] && echo "$CANDIDATES" | grep -x -q "$tmp" &&
- default=$tmp || default=none
+ if [[ $tmp ]] && real_list_find "$CANDIDATES" "$tmp"; then
+ default=$tmp
+ else
+ message "${PROBLEM_COLOR}The default provider is not good anymore!"
+ message "Falling back to 'none' as the default
choice.$DEFAULT_COLOR"
+ default=none
+ fi
else
default=none
fi
@@ -1077,10 +1094,23 @@ function work_optional_depends_provider()
fi

# check if theres a provider already installed
+ # if there are multiple, try to select the previously used one
if [[ ! $default ]]; then
for tmp in $CANDIDATES; do
- spell_ok $tmp && default=$tmp && break
+ spell_ok $tmp && real_list_add choices $tmp
done
+ if [[ $choices == ${choices##* } ]]; then
+ default=$choices
+ else
+ # only search for enabled dependencies since none is already the
default
+ explode "$(search_depends_status_simple $DEPENDS_STATUS "$SPELL"
".*($1)" "on")" ":" "status"
+ local old_provider=${status[1]%(*} # Name of spell which provides $1
+ if real_list_find "$choices" $old_provider; then
+ default=$old_provider
+ else
+ default=${choices%% *}
+ fi
+ fi
fi

select_provider "provider" "$default" 1 $CANDIDATES
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 3c080f5..19e1777 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -1193,7 +1193,7 @@ function clean_logs() {
{
# don't try to delete logs of installed spells, as they may not exist
# tee duplicates the output, so uniq will filter them out
- log_list | tee /dev/stdout
+ log_list | sed p
find $INSTALL_LOGS $MD5SUM_LOGS $COMPILE_LOGS -type f
} | sort | uniq -u |
while read file; do
@@ -1376,7 +1376,7 @@ function generate_keep_list() {
while read SPELL_DIRECTORY ; do
codex_set_current_spell_quick $SPELL_DIRECTORY &>/dev/null
sources 2>/dev/null
- ls /var/cache/sorcery/$SPELL-$VERSION-* 1>&2 2>/dev/null
+ ls $INSTALL_CACHE/$SPELL-$VERSION-* 1>&2 2>/dev/null
unset VERSION SPELL ${!SOURCE*}
done
) 2> $cache_keep > $source_keep



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (60fece67f8083aa0ad15f372945ced46e7ae2792), Jaka Kranjc, 06/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page