[SM-Commit] BZR Change 9 to stage-root sorcery by David Brown <dmlb2000 at dmlb2004>

bzr at mail.sourcemage.org bzr at mail.sourcemage.org
Wed Apr 12 01:40:05 EDT 2006


------------------------------------------------------------
revno: 9
committer: David Brown <dmlb2000 at dmlb2004>
branch nick: stage-root
timestamp: Tue 2006-04-11 22:29:08 -0700
message:
  changed where the config files get staged to look more like the tablet directory
  structure

=== modified file 'var/lib/sorcery/modules/build_api/common'
--- var/lib/sorcery/modules/build_api/common	
+++ var/lib/sorcery/modules/build_api/common	
@@ -254,7 +254,8 @@
                "${FILE_COLOR}${tablet_dir}${DEFAULT_COLOR}"
       tablet_install_spell_files $tablet_dir
       local TABLET_SPELL_DIR=$tablet_dir
-
+      mv $CONFIG_STAGE_DIRECTORY/$SPELL/current \
+         $CONFIG_STAGE_DIRECTORY/$SPELL/$(basename $tablet_dir)
       # this data is now doubly stale, remove it
       rm  -f $ABANDONED_PERSIST/$SPELL.p
     fi

=== modified file 'var/lib/sorcery/modules/libstage'
--- var/lib/sorcery/modules/libstage	
+++ var/lib/sorcery/modules/libstage	
@@ -88,8 +88,8 @@
 function stage_install_file()
 {
   local FILE=$1
-  local PERMISSION=$(stat -c %a "${STAGE_DIRECTORY}/TRANSL/${FILE}")
-  local SAVE=$CONFIG_STAGE_DIRECTORY/$FILE.$(date +%Y%m%d%H%M%S)
+  local PERMISSION=$(stat -c %a "${STAGE_DIRECTORY}/TRANSL/$FILE")
+  local SAVE="$CONFIG_STAGE_DIRECTORY/$SPELL/current/$FILE"
   message "${FILE_COLOR}$PERMISSION $FILE${DEFAULT_COLOR}"
   case $2 in
     config)




More information about the SM-Commit mailing list