Skip to Content.
Sympa Menu

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

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 (b89dea0d9c78055ec4fef7bc281eca7341fb849c)
  • Date: Sun, 6 Jul 2008 12:15:11 -0500

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

ChangeLog | 36
++++++++++++++++++++++++++++++++++++
build | 2 +-
etc/sorcery/version | 2 +-
usr/sbin/cast | 5 +----
usr/sbin/cleanse | 2 +-
usr/sbin/summon | 5 -----
usr/sbin/vcast | 2 --
usr/share/man/man8/sorcery.8 | 29 +++++++++++++++++++++++++++++
usr/share/man/man8/summon.8 | 5 -----
var/lib/sorcery/modules/libapi | 2 +-
var/lib/sorcery/modules/libcodex | 2 +-
var/lib/sorcery/modules/libmisc | 2 +-
var/lib/sorcery/modules/libsorcery | 2 +-
var/lib/sorcery/modules/libstage | 24 ++++++++++++++++--------
var/lib/sorcery/modules/libtablet | 13 +++++++------
15 files changed, 96 insertions(+), 37 deletions(-)

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

1.14.1-rc3

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

libstage:
fixed a regression that caused us not to install excluded configs #14339

(cherry-picked from commit 52b245813ee2d999a7526a7804ca0dcda41f758c)

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

libstage: install the rest of the files first, so any leading directories
the configs need get properly created; renamed stage_install_rest to
stage_install_ordinary

(cherry-picked from commit 9fdaa903b22a2d8c0a86051dea220df18df0e8db)

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

libsorcery: in verify_source print "failure" instead of the
unusual "failed"

(cherry-picked from commit 378feae52640a619ea43a422fccb0bb0a037ee46)

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

sorcery.8: clarify the sorcery default subcommands with examples #14528

(cherry-picked from commit f2e4bc7a673410538b8bf5ef59bd6d556387e6a6)

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

cast, summon, vcast, libapi, libmisc: removed --url remnants #14525
If you want to download from a different location, use summon --raw

(cherry-picked from commit 7ee109ab65a36e333a9da84fe3a7f6b9682ad335)

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

cleanse: call tablet_coalesce_files with $BACKUPDIR, so the log isn't
discarded right away

(cherry-picked from commit bd888cc459e8dbe9e1484c0fde4350cafdf2a65e)

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

libtablet: increment the counter before drawing the progress bar - this
way it will
reach 100%

(cherry-picked from commit b546475f32e36500d321652d1ac4fcea6db2b4ba)

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

libtablet: append to the link_log, don't overwrite it each time

(cherry-picked from commit 65e5df81052237ed6050d9fceefb6bcc0e6e9d38)

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

libtablet: sped up tablet_coalesce_files to take a third of the time

(cherry-picked from commit 18a01137dcb6436756085ba2946651d2fcbaa106)

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

libcodex: fixed an ancient minibug in codex_check_cache - the error
message was printing the wrong variable

it was already present when the cvs import happened

(cherry-picked from commit c203f260c80815e321976d3637362062544c87e3)

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

build: fixed a typo in the pwd error message

(cherry-picked from commit 481761312bbc496f2568c9dfc37ce48f0de81aba)

diff --git a/ChangeLog b/ChangeLog
index f583074..68a1493 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2008-07-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libstage: install the rest of the files first, so any leading
directories
+ the configs need get properly created; renamed stage_install_rest to
+ stage_install_ordinary
+ fixed a regression that caused us not to install excluded configs
#14339
+
+2008-06-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: in verify_source print "failure" instead of the
+ unusual "failed"
+
+2008-06-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * sorcery.8: clarify the sorcery default subcommands with examples
#14528
+
+2008-06-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * cast, summon, vcast, libapi, libmisc: removed --url remnants #14525
+ If you want to download from a different location, use summon --raw
+
+2008-06-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ increment the counter before drawing the progress bar - this way it
will
+ reach 100%
+ * cleanse: call tablet_coalesce_files with $BACKUPDIR, so the log
isn't
+ discarded right away
+
+2008-06-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ append to the link_log, don't overwrite it each time
+
+2008-06-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtablet: sped up tablet_coalesce_files to take a third of the time
+
+2008-06-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcodex: fixed an ancient minibug in codex_check_cache - the error
+ message was printing the wrong variable
+
+2008-05-31 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * build: fixed a typo in the pwd error message
+
2008-05-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* config: use $HOME instead of hardcoding /root

diff --git a/build b/build
index f02fc71..acd9ec0 100755
--- a/build
+++ b/build
@@ -12,7 +12,7 @@ else
fi

if [ -e ../sorcery ]; then
- echo "We need a blank directory beneath the current on to link sorcery ->
$branch_dir"
+ echo "We need a blank directory beneath the current one to link sorcery ->
$branch_dir"
exit 1
fi
[[ $branch_name == devel ]] && date "+%Y%m%d" > etc/sorcery/version
diff --git a/etc/sorcery/version b/etc/sorcery/version
index cdd5896..7a978b6 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.1-rc2
+1.14.1-rc3
diff --git a/usr/sbin/cast b/usr/sbin/cast
index 3459443..fe88027 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -69,7 +69,6 @@ Optional Parameters:
-b | --force-base-dep Force all spells to depend on basesystem

--from directory Specify an alternate for $SOURCE_CACHE
- --url URL Specify an alternate download URL

--queue Cast all spells listed in $INSTALL_QUEUE

@@ -83,7 +82,7 @@ EOF
## @Aguments Arguments of cast
## @Globals DEPS_ONLY RECONFIGURE COMPILE
## @Globals FORCE_DOWNLOAD SOURCE_CACHE SILENT SEPARATE
-## @Globals BASE_URL INSTALL_QUEUE
+## @Globals INSTALL_QUEUE
##
#---------------------------------------------------------------------
function process_parameters() {
@@ -118,7 +117,6 @@ function process_parameters() {
--from) export SOURCE_CACHE=$2; shift 2
;;
--silent) SILENT="$1"; shift 1
;;
-s) export SEPARATE="$1"; shift 1
;;
- --url) export BASE_URL="$2"; shift 2
;;
--queue) CAST_QUEUE=yes ; COMPILE=$1; shift 1
;;
*) help ;;
esac
@@ -166,7 +164,6 @@ function strip_parameters() {
-c|--compile) shift 1 ;;
-d|--download) shift 1 ;;
-s) shift 1 ;;
- --url) shift 2 ;;
--queue) shift 1 ;;
*) shift 1 ;;

diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index 3e91c3e..40f195c 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -150,7 +150,7 @@ function args()
tablet_cleanse_tablet $TABLET_PATH $BACKUPDIR
let rc+=$?
if [[ $1 == coalesce ]] ; then
- tablet_coalesce_files $TABLET_PATH
+ tablet_coalesce_files $TABLET_PATH $BACKUPDIR
let rc+=$?
shift
fi
diff --git a/usr/sbin/summon b/usr/sbin/summon
index 6a08dbc..899ee8f 100755
--- a/usr/sbin/summon
+++ b/usr/sbin/summon
@@ -35,9 +35,6 @@ Optional Parameters:

--from <directory> Specify an alternate for $SOURCE_CACHE

-
---url <URL> Specify an alternate download URL
-
-d | --download Force download of source, regardless of
of whether it exists locally or not.

@@ -86,7 +83,6 @@ fi
case $1 in
--from) SOURCE_CACHE=$2; shift 2 ;;
--help) help; exit 1 ;;
- --url) BASE_URL="$2" ; shift 2 ;;
-d|--download) FORCE_DOWNLOAD=on; shift 1 ;;
-g|--grimoire) codex_set_grimoires $2; shift 2 ;;
-p|--print) set_print_type $2; shift 2 ;;
@@ -113,7 +109,6 @@ strip_parameters() {
case $1 in
--from) shift 2 ;;
--help) shift 1 ;;
- --url) shift 2 ;;
-d|--download) shift 1 ;;
-g|--grimoire) shift 2 ;;
-p|--print) shift 2 ;;
diff --git a/usr/sbin/vcast b/usr/sbin/vcast
index de0e05a..6fdd6d1 100755
--- a/usr/sbin/vcast
+++ b/usr/sbin/vcast
@@ -30,7 +30,6 @@ process_parameters() {
case $1 in

--from) export SOURCE_CACHE="$2"; shift 2 ;;
- --url) export BASE_URL="$2"; shift 2 ;;
-n|--nofix) NO_SUMMON="$1"; NO_GAZE="$1"; shift 1 ;;
--silent) NO_SUMMON="$1"; NO_GAZE="$1"; shift 1 ;;
--deps) NO_SUMMON="$1"; shift 1 ;;
@@ -57,7 +56,6 @@ strip_parameters() {

case $1 in
--from) shift 2 ;;
- --url) shift 2 ;;
*) shift 1 ;;
esac

diff --git a/usr/share/man/man8/sorcery.8 b/usr/share/man/man8/sorcery.8
index 03cd4cb..e4f3d89 100644
--- a/usr/share/man/man8/sorcery.8
+++ b/usr/share/man/man8/sorcery.8
@@ -73,10 +73,39 @@ and the provider if set to on.
This adds a default statement to the list.
Either <on> or <what> (not both) can be "", in which case they work as
wildcards (anything <what> depends on / anything that depends on <on>)
+.PP
+.I Examples:
+.TP
+default add spell_1 spell_2 off
+If "spell_1" optionally depends on "spell_2" the default answer is off.
+
+.TP
+default add "" spell on
+If anything optionally depends on "spell" the default answer is on.
+
+.TP
+default add spell "" off
+If "spell" optionally depends on anything the default answer is off.
+
+.TP
+default add spell PROVIDER on
+"Spell" is the default provider for PROVIDER. In the case of optional_depends
+and the value of "off", "none" is chosen as the default instead.
+
.SS default remove|search [<on>|"" [<what>|"" [on|off]]]
These are used to search or modify the defaults list.
Anything not specified or blank will be a wildcard.
Everything that matches will be removed/shown.
+.PP
+.I Examples:
+.TP
+default remove spell_1 spell_2
+The default answer for when "spell_1" optionally depends on "spell_2" is
removed.
+
+.TP
+default search spell PROVIDER off
+Search the defaults to see if "spell" is not the default provider of
PROVIDER.
+
.SS -v|--version
Displays the version number of your sorcery package.
Always use this information when filing bugs.
diff --git a/usr/share/man/man8/summon.8 b/usr/share/man/man8/summon.8
index 2ec4a0f..620e190 100755
--- a/usr/share/man/man8/summon.8
+++ b/usr/share/man/man8/summon.8
@@ -28,11 +28,6 @@ directory, the directory the packages get downloaded to.
(or actually moved to when the download finished)
This may seem a strange name, but logical if you see that cast
uses the same name for the same thing.
-.SS --url <url>
-This tries to download the specified spell from a different location.
-Specify only the directory, not the file.
-There are sorcery options to better handle this,
-this option is not recommended and may be removed in the future.
.SS -d|--download
This forces download even when the file already exists locally,
instead of skipping it in that case.
diff --git a/var/lib/sorcery/modules/libapi b/var/lib/sorcery/modules/libapi
index be17e81..626de78 100755
--- a/var/lib/sorcery/modules/libapi
+++ b/var/lib/sorcery/modules/libapi
@@ -125,7 +125,7 @@
# CAST_PASS download_log IW_LOG SOLO QUIET INSTALL_QUEUE
# OVERRIDE_CFLAGS OVERRIDE_CXXFLAGS OVERRIDE_LDFLAGS NO_OPTIMIZATION_FLAGS
# DOT_PROGRESS VOYEUR_OVERRIDE RECONFIGURE RECAST_DOWN COMPILE RECAST_UP
-# FORCE_DOWNLOAD SILENT FIX DEBUG SEPARATE BASE_URL
+# FORCE_DOWNLOAD SILENT FIX DEBUG SEPARATE
# CAST_HASH BACK_CAST_HASH CANNOT_CAST_HASH uncommitted_hash NEW_DEPENDS
# spell_depends DEPENDS_CONFIG UP_DEPENDS SPELL_CONFIG GRIMOIRE_DIR
# BUILD_API VOYEUR_STDOUT VOYEUR_STDERR C_LOG C_FIFO INST_LOG MD5_LOG
diff --git a/var/lib/sorcery/modules/libcodex
b/var/lib/sorcery/modules/libcodex
index 44793be..aa01d72 100755
--- a/var/lib/sorcery/modules/libcodex
+++ b/var/lib/sorcery/modules/libcodex
@@ -730,7 +730,7 @@ function codex_check_cache() {
codex_create_cache
fi
if ! [ -f $1/$SPELL_INDEX_FILE ] || ! [ -f $1/$PROVIDE_INDEX_FILE ]; then
- message "${PROBLEM_COLOR}Eeek, $2 is not a grimoire!${DEFAULT_COLOR}" >&2
+ error_message "${PROBLEM_COLOR}Eeek, $1 is not a
grimoire!${DEFAULT_COLOR}"
exit 1
fi
}
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index dcbd21e..35590b3 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1252,7 +1252,7 @@ function is_sorcery_var() {
CAST_PASS download_log IW_LOG OPTS SOLO QUIET INSTALL_QUEUE \
OVERRIDE_CFLAGS OVERRIDE_CXXFLAGS OVERRIDE_LDFLAGS NO_OPTIMIZATION_FLAGS \
DOT_PROGRESS VOYEUR_OVERRIDE RECONFIGURE RECAST_DOWN COMPILE RECAST_UP \
- FORCE_DOWNLOAD SOURCE_CACHE SILENT FIX DEBUG SEPARATE BASE_URL \
+ FORCE_DOWNLOAD SOURCE_CACHE SILENT FIX DEBUG SEPARATE \
CAST_HASH BACK_CAST_HASH CANNOT_CAST_HASH uncommitted_hash NEW_DEPENDS \
spell_depends DEPENDS_CONFIG UP_DEPENDS SPELL_CONFIG GRIMOIRE_DIR \
SCRIPT_DIRECTORY SECTION_DIRECTORY GRIMOIRE SPELL_DIRECTORY SECTION \
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 19e1777..ba6e114 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -1298,7 +1298,7 @@ function verify_source() { (
then
message "${PROBLEM_COLOR}Missing ${FILE_COLOR}${1}${DEFAULT_COLOR}"
message "${PROBLEM_COLOR}Cast aborting.${DEFAULT_COLOR}"
- activity_log "cast" "$SPELL" "$VERSION" "failed" \
+ activity_log "cast" "$SPELL" "$VERSION" "failure" \
"because it was missing source: $1"
return 1
fi
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index cadfa98..457fd53 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -12,11 +12,11 @@
#---------------------------------------------------------------------
function transfer_staged_spell()
{
+ stage_install_ordinary
lock_file "$CONFIG_STAGE_DIRECTORY/$SPELL"
mkdir -p "$CONFIG_STAGE_DIRECTORY/$SPELL/current"
stage_install_configs
unlock_file "$CONFIG_STAGE_DIRECTORY/$SPELL"
- stage_install_rest
}

function filter_spell_configs()
@@ -25,23 +25,31 @@ function filter_spell_configs()
}

#---------------------------------------------------------------------
-## Install config files to a staged location on the system
+## Install config files to a staged location on the system or if
+## they are also excluded, just install them normally.
#---------------------------------------------------------------------
function stage_install_configs()
{
+ local spell_configs=$(get_all_package_files | filter_spell_configs -v)
+
+ # install excluded configs as ordinary files - do not stage them
+ message "${MESSAGE_COLOR}Installing excluded config files${DEFAULT_COLOR}"
+ echo "$spell_configs" |
+ filter_excluded -v |
+ stage_install_files
+
message "${MESSAGE_COLOR}Staging config files into the
system${DEFAULT_COLOR}"
- get_all_package_files |
- filter_spell_configs -v |
- filter_excluded |
+ echo "$spell_configs" |
+ filter_excluded |
stage_install_files config
}

#---------------------------------------------------------------------
-## Install the rest of the files in the stage root
+## Install non-configs in the stage root
#---------------------------------------------------------------------
-function stage_install_rest()
+function stage_install_ordinary()
{
- message "${MESSAGE_COLOR}Installing the rest of the files${DEFAULT_COLOR}"
+ message "${MESSAGE_COLOR}Installing ordinary files${DEFAULT_COLOR}"
get_all_package_files |
filter_spell_configs |
stage_install_files
diff --git a/var/lib/sorcery/modules/libtablet
b/var/lib/sorcery/modules/libtablet
index 794523e..8f1f956 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -865,12 +865,13 @@ function tablet_coalesce_files() {

local total_files=$(find $dir -type f 2>/dev/null|wc -l)
message "Computing md5sum of $total_files tablet files"
- function tablet_coalesce_files_sub() {
- hash_append tablet_coalesce $(md5sum $1 2>/dev/null)
- progress_bar $i $total_files
+ # the + makes find stack found files, so md5sum is invoked a lot less often
+ find $dir -type f -exec md5sum {} + 2>/dev/null |
+ while read line; do
+ hash_append tablet_coalesce $line
let i+=1
- }
- iterate tablet_coalesce_files_sub $'\n' "$(find $dir -type f)"
+ progress_bar $i $total_files
+ done
message ""

# hash_get_table dumps out the table values one per line
@@ -880,7 +881,7 @@ 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
+ echo "Linking $car to ${cdr[$i]}" >> $link_log
ln -f $car ${cdr[$i]}
done
done



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

Archive powered by MHonArc 2.6.24.

Top of Page