Skip to Content.
Sympa Menu

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

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 (6b4f1032fa263eb49bef0a10898a47e68dd43054)
  • Date: Sun, 3 Feb 2008 13:54:03 -0600

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

ChangeLog | 6 ++++++
usr/sbin/cast | 1 +
var/lib/sorcery/modules/build_api/common | 21 +++++++++++++++++++++
var/lib/sorcery/modules/libstage | 2 +-
4 files changed, 29 insertions(+), 1 deletion(-)

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

common: stage configs only if they are not identical to any previously
staged config. Now confmeld will offer only the first of the set and
repeated castings won't clutter $CONFIG_STAGE_DIRECTORY

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

libstage: really check if it is a file in stage_install_list, so the else
error catch makes sense

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

cast: call clean_resources in cast_cleanup

diff --git a/ChangeLog b/ChangeLog
index 79421d7..9708bb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-02-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libunpack: return 1 when no algorithm is allowed
+ * cast: call clean_resources in cast_cleanup
+ * libstage: really check if it is a file in stage_install_list, so
the else
+ error catch makes sense
+ * common: stage configs only if they are not identical to any
previously
+ staged config. Now confmeld will offer only the first of the set and
+ repeated castings won't clutter $CONFIG_STAGE_DIRECTORY

2008-02-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libgpg, libunpack: added multisign support #13815
diff --git a/usr/sbin/cast b/usr/sbin/cast
index a321473..fd9c01c 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -777,6 +777,7 @@ function int_trap()
function cast_cleanup() {
$STD_DEBUG
cleanup_tmp_dir $TMP_DIR
+ clean_resources
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 3094c7b..d905b76 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -294,6 +294,27 @@ function run_spell_success() {
then
if ! rmdir $spell_config_stage/current $spell_config_stage
2>/dev/null;
then
+ # check if a config we staged was already staged and if so, remove
it.
+ # this way users don't have to merge the same old default config
again
+ # and again if they cast a spell multiple times
+ local deferred_file file quasi_basename
+ find $spell_config_stage/current -type f |
+ while read deferred_file; do
+ quasi_basename=$(sed "s,$spell_config_stage/current/,," <<<
"$deferred_file")
+ find $spell_config_stage -wholename $spell_config_stage/current \
+ -prune -o -type f -wholename "*/$quasi_basename" -print |
+ while read file; do
+ if cmp -s $deferred_file $file; then
+ rm $deferred_file
+ pushd $spell_config_stage
+ rmdir -p $(smgl_dirname $deferred_file)
+ popd
+ continue
+ fi &>/dev/null
+ done
+ done
+
+ [[ -d $spell_config_stage/current ]] &&
mv $spell_config_stage/current \
$spell_config_stage/$(basename $tablet_dir)
fi
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 41f7d09..a4b40b1 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -219,7 +219,7 @@ function stage_install_list()
elif [[ -p $STAGE_DIRECTORY/TRANSL/$1 ]]
then
stage_install_fifo "$@"
- elif [[ ! -d $STAGE_DIRECTORY/TRANSL/$1 ]]
+ elif [[ -f $STAGE_DIRECTORY/TRANSL/$1 ]]
then
stage_install_file "$@"
elif [[ -d $STAGE_DIRECTORY/TRANSL/$1 ]]



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (6b4f1032fa263eb49bef0a10898a47e68dd43054), Jaka Kranjc, 02/03/2008

Archive powered by MHonArc 2.6.24.

Top of Page