Skip to Content.
Sympa Menu

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

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 (5d1c4848db5c0d987a2858646b7defedacbea1ed)
  • Date: Wed, 18 Jun 2008 06:22:09 -0500

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

ChangeLog | 6 +
etc/sorcery/config | 120
++++++++++++++++++-------------------
var/lib/sorcery/modules/libsorcery | 2
var/lib/sorcery/modules/libtablet | 6 +
4 files changed, 71 insertions(+), 63 deletions(-)

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

libtablet: only hardlink files if they're not already hardlinked when
coalescing the tablet

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

libsorcery: increment the counter before drawing the progress bar
doesn't matter much, since it is cleared right after, but I'm a
perfectionist

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

made the rest of the previously overridable variables overridable

diff --git a/ChangeLog b/ChangeLog
index f30de12..847ff51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * config: made the rest of the previously overridable variables
overridable
+ * libsorcery: increment the counter before drawing the progress bar
+ * libtablet: only hardlink files if they're not already hardlinked
when
+ coalescing the tablet
+
2008-06-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* sorcery_config.5: clarify what the internal_version is for
* libtablet: sped up tablet_coalesce_files to take a third of the time
diff --git a/etc/sorcery/config b/etc/sorcery/config
index e2d4495..b863fca 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -16,8 +16,8 @@ color() {
}
. $LOCAL_CONFIG

- CAST=cast
- SORCERY_BRANCH="stable"
+ CAST=${CAST:-cast}
+ SORCERY_BRANCH=${SORCERY_BRANCH:-"stable"}
ARCHIVE=${ARCHIVE:=on}
AUTOFIX=${AUTOFIX:=on}
UPDATEFIX=${UPDATEFIX:=off}
@@ -50,7 +50,7 @@ color() {
STRICT_SCM_UPDATE=${STRICT_SCM_UPDATE:=off}
NICE=${NICE:=+10}
UMASK=${UMASK:=0022}
- SORCERY_PATH="/usr/sbin"
+ SORCERY_PATH=${SORCERY_PATH:-"/usr/sbin"}
FORCE_BASESYSTEM_DEPENDS=${FORCE_BASESYSTEM_DEPENDS:-off}

LDD_CHECK=${LDD_CHECK:=on}
@@ -83,55 +83,55 @@ FORCE_BASESYSTEM_DEPENDS=${FORCE_BASESYSTEM_DEPENDS:-off}
ARCHITECTURE=${ARCHITECTURE:=i386}
OPTIMIZATIONS=${OPTIMIZATIONS:=strip}

- COMPILE_CONFIG=/etc/sorcery/compile_config
- ROOTS_CONFIG=/etc/sorcery/roots
- MEDIA_CONFIG=/etc/sorcery/media
- URL_CONFIG=/etc/sorcery/url
- STATE_CONFIG=/etc/sorcery/state
- SCREEN_CONFIG=/etc/sorcery/screen
-
- CONFIG_CACHE=/etc/sorcery/local
-
- SORCERY_INSTALL_LOG=/etc/sorcery/install.log
-
- MIRRORS=/etc/sorcery/mirrors
- SM_LICENSE_DIRECTORY=/etc/sorcery/licenses
-SM_CONFIG_OPTION_CACHE=/etc/sorcery/local/config_option_cache
- ACCOUNT_LIST=/etc/sorcery/accounts
- GROUP_LIST=/etc/sorcery/groups
- GRIMOIRE_LIST=/etc/sorcery/local/grimoire
- GRIMOIRE_LIST_BACKUP=/etc/sorcery/local/grimoire.backup
- RESTORE_SCRIPT=$HOME/sorcery.restore
- CABAL_DIRECTORY=/etc/sorcery/cabal
- CABAL_NAMES=$CABAL_DIRECTORY/names
- CABAL_KEYS=$CABAL_DIRECTORY/keys
- CABAL_OUTPUT=/tmp/cabal.output
-
- GPG_KEY_DIR=/usr/share/smgl-pubkeys
- GPG_SIG_EXT=asc
- GPG_VERIFY_SORCERY=no
- GPG_VERIFY_GRIMOIRE=no
+ COMPILE_CONFIG=${COMPILE_CONFIG:-/etc/sorcery/compile_config}
+ ROOTS_CONFIG=${ROOTS_CONFIG:-/etc/sorcery/roots}
+ MEDIA_CONFIG=${MEDIA_CONFIG:-/etc/sorcery/media}
+ URL_CONFIG=${URL_CONFIG:-/etc/sorcery/url}
+ STATE_CONFIG=${STATE_CONFIG:-/etc/sorcery/state}
+ SCREEN_CONFIG=${SCREEN_CONFIG:-/etc/sorcery/screen}
+
+ CONFIG_CACHE=${CONFIG_CACHE:-/etc/sorcery/local}
+
+ SORCERY_INSTALL_LOG=${SORCERY_INSTALL_LOG:-/etc/sorcery/install.log}
+
+ MIRRORS=${MIRRORS:-/etc/sorcery/mirrors}
+ SM_LICENSE_DIRECTORY=${SM_LICENSE_DIRECTORY:-/etc/sorcery/licenses}
+SM_CONFIG_OPTION_CACHE=${SM_CONFIG_OPTION_CACHE:-/etc/sorcery/local/config_option_cache}
+ ACCOUNT_LIST=${ACCOUNT_LIST:-/etc/sorcery/accounts}
+ GROUP_LIST=${GROUP_LIST:-/etc/sorcery/groups}
+ GRIMOIRE_LIST=${GRIMOIRE_LIST:-/etc/sorcery/local/grimoire}
+
GRIMOIRE_LIST_BACKUP=${GRIMOIRE_LIST_BACKUP:-/etc/sorcery/local/grimoire.backup}
+ RESTORE_SCRIPT=${RESTORE_SCRIPT:-$HOME/sorcery.restore}
+ CABAL_DIRECTORY=${CABAL_DIRECTORY:-/etc/sorcery/cabal}
+ CABAL_NAMES=${CABAL_NAMES:-$CABAL_DIRECTORY/names}
+ CABAL_KEYS=${CABAL_KEYS:-$CABAL_DIRECTORY/keys}
+ CABAL_OUTPUT=${CABAL_OUTPUT:-/tmp/cabal.output}
+
+ GPG_KEY_DIR=${GPG_KEY_DIR:-/usr/share/smgl-pubkeys}
+ GPG_SIG_EXT=${GPG_SIG_EXT:-asc}
+ GPG_VERIFY_SORCERY=${GPG_VERIFY_SORCERY:-no}
+ GPG_VERIFY_GRIMOIRE=${GPG_VERIFY_GRIMOIRE:-no}

-VERIFY_SPELL_LEVELS="WORKS_FOR_ME UPSTREAM_HASH UPSTREAM_KEY
ESTABLISHED_UPSTREAM_KEY VERIFIED_UPSTREAM_HASH VERIFIED_UPSTREAM_KEY
ID_CHECK_UPSTREAM_KEY"
-DEFAULT_SPELL_VRF_LEVEL="WORKS_FOR_ME"
- VRF_ALLOWED_LEVELS=""
- VRF_ALLOW_NEW_LEVELS="on"
- VRF_ALLOWED_HASHES=""
- VRF_ALLOW_NEW_HASHES="on"
- GPG_GRIMOIRE_LIST="test stable-rc stable games z-rejected hardened"
-GRIMOIRE_MANIFEST_ALGORITHM=sha1
-
- DEF_INSTALL_INIT=off
- DEF_ENABLE_INIT=off
- DEF_INSTALL_XINETD=off
- DEF_ENABLE_XINETD=off
- DEF_INIT_VS_XINETD=off
-
- SGL_LIBRARY=/var/lib/sorcery
+VERIFY_SPELL_LEVELS=${VERIFY_SPELL_LEVELS:-"WORKS_FOR_ME UPSTREAM_HASH
UPSTREAM_KEY ESTABLISHED_UPSTREAM_KEY VERIFIED_UPSTREAM_HASH
VERIFIED_UPSTREAM_KEY ID_CHECK_UPSTREAM_KEY"}
+DEFAULT_SPELL_VRF_LEVEL=${DEFAULT_SPELL_VRF_LEVEL:-"WORKS_FOR_ME"}
+ VRF_ALLOWED_LEVELS=${VRF_ALLOWED_LEVELS:-""}
+ VRF_ALLOW_NEW_LEVELS=${VRF_ALLOW_NEW_LEVELS:-"on"}
+ VRF_ALLOWED_HASHES=${VRF_ALLOWED_HASHES:-""}
+ VRF_ALLOW_NEW_HASHES=${VRF_ALLOW_NEW_HASHES:-"on"}
+ GPG_GRIMOIRE_LIST=${GPG_GRIMOIRE_LIST:-"test stable-rc stable games
z-rejected hardened"}
+GRIMOIRE_MANIFEST_ALGORITHM=${GRIMOIRE_MANIFEST_ALGORITHM:-sha1}
+
+ DEF_INSTALL_INIT=${DEF_INSTALL_INIT:-off}
+ DEF_ENABLE_INIT=${DEF_ENABLE_INIT:-off}
+ DEF_INSTALL_XINETD=${DEF_INSTALL_XINETD:-off}
+ DEF_ENABLE_XINETD=${DEF_ENABLE_XINETD:-off}
+ DEF_INIT_VS_XINETD=${DEF_INIT_VS_XINETD:-off}
+
+ SGL_LIBRARY=${SGL_LIBRARY:-/var/lib/sorcery}
SGL_LIBRARY_MODULES=${SGL_LIBRARY}/modules
# system archspecs are still considered part of sorcery
# and are deliberatly not in INSTALL_ROOT
- ARCH_SPECS="/usr/share/archspecs"
+ ARCH_SPECS=${ARCH_SPECS:-"/usr/share/archspecs"}
EXCLUDED=${SGL_LIBRARY}/excluded
CODEX=${SGL_LIBRARY}/codex
PROTECTED=${SGL_LIBRARY}/protected
@@ -142,16 +142,16 @@ GRIMOIRE_MANIFEST_ALGORITHM=sha1
SUSTAINED=${SGL_LIBRARY}/sustained
SM_LICENSE_LIST=${SM_LICENSE_DIRECTORY}/license_list

- SPELL_INDEX_FILE=codex.index
- PROVIDE_INDEX_FILE=provides.index
- KEYWORD_INDEX_FILE=keyword.index
- VERSION_INDEX_FILE=version.index
+ SPELL_INDEX_FILE=${SPELL_INDEX_FILE:-codex.index}
+ PROVIDE_INDEX_FILE=${PROVIDE_INDEX_FILE:-provides.index}
+ KEYWORD_INDEX_FILE=${KEYWORD_INDEX_FILE:-keyword.index}
+ VERSION_INDEX_FILE=${VERSION_INDEX_FILE:-version.index}

- LOCK_DIR=/tmp/liblock-$UID
- LOCK_TRANSACTIONS="$LOCK_DIR/liblock.locklist"
- MAX_SLEEP=3
+ LOCK_DIR=${LOCK_DIR:-/tmp/liblock-$UID}
+ LOCK_TRANSACTIONS=${LOCK_TRANSACTIONS:-"$LOCK_DIR/liblock.locklist"}
+ MAX_SLEEP=${MAX_SLEEP:-3}

- TABLET_MAX_VERSION=1
+ TABLET_MAX_VERSION=${TABLET_MAX_VERSION:-1}

SOURCE_CACHE=${SOURCE_CACHE:=/var/spool/sorcery}

@@ -167,10 +167,10 @@
DEFAULT_CHANGED_CONFIG_ACTION=${DEFAULT_CHANGED_CONFIG_ACTION:-2}

SCREEN=${SCREEN:-off}

- GAZE_ALIEN_PATHS="/bin /boot /etc /lib /sbin /usr /var"
- DOCS='README* FAQ* CHAN* DOC* SETUP LICENSE COPYING NEWS
*rc'
- DOC_DIRS='doc* conf'
-PROGRESS_SPINNER_CHARS='-\|/'
+ GAZE_ALIEN_PATHS=${GAZE_ALIEN_PATHS:-"/bin /boot /etc /lib
/sbin /usr /var"}
+ DOCS=${DOCS:-'README* FAQ* CHAN* DOC* SETUP LICENSE COPYING
NEWS *rc'}
+ DOC_DIRS=${DOC_DIRS:-'doc* conf'}
+PROGRESS_SPINNER_CHARS=${PROGRESS_SPINNER_CHARS:-'-\|/'}
VERBOSE_QUEUING=${VERBOSE_QUEUING:-on}

WHITESPACE_IFS=$' \t\n'
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 3473797..446836c 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -982,6 +982,7 @@ function update_install_queue() {
count=0
size=$(wc -l < $recheck_queue)
while read spell; do
+ let count++
progress_bar $count $size 50
explode "$(search_spell_status $SPELL_STATUS "$spell")" ":" "info"
curr_updated=${info[1]}
@@ -989,7 +990,6 @@ function update_install_queue() {
codex_set_current_spell_by_name $spell &&
does_spell_need_update_sub "$spell" "$curr_version" \
"$curr_updated" "$tmp_queue"
- let count++
done < $recheck_queue
clear_line
)
diff --git a/var/lib/sorcery/modules/libtablet
b/var/lib/sorcery/modules/libtablet
index 7fd438b..e9569f2 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -939,8 +939,10 @@ function tablet_coalesce_files() {
hash_get_table tablet_coalesce| while read -a cdr; do
car=${cdr[0]}
for (( i=1 ; i<${#cdr[*]} ; i++ )) ; do
- echo "Linking $car to ${cdr[$i]}" >> $link_log
- ln -f $car ${cdr[$i]}
+ if ! [[ $car -ef ${cdr[$i]} ]]; then
+ echo "Linking $car to ${cdr[$i]}" >> $link_log
+ ln -f $car ${cdr[$i]}
+ fi
done
done
hash_unset tablet_coalesce



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (5d1c4848db5c0d987a2858646b7defedacbea1ed), Jaka Kranjc, 06/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page