Skip to Content.
Sympa Menu

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

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 (e651f71f210f5f01e05cac7c6777630ac0f16122)
  • Date: Tue, 29 Jan 2008 17:05:18 -0600

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

ChangeLog | 2 ++
var/lib/sorcery/modules/build_api/common | 15 ++++++++++++---
var/lib/sorcery/modules/libtrack | 20 ++++++++++++++++++++
3 files changed, 34 insertions(+), 3 deletions(-)

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

common, libtrack: save the md5sums of the files in the stage and not the
target
ones on the system, otherwise config merging breaks #13835

diff --git a/ChangeLog b/ChangeLog
index 1cc9e6a..1c582f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* local/README: fixed typo
* confmeld, libressurect: improved the merge message for better
readability
* libstage: don't stage excluded files in /etc as configs
+ * common, libtrack: save the md5sums of the files in the stage and
not the target
+ ones on the system, otherwise config merging breaks #13835

2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* cast: suggest the user to run confmeld if there are any deferred
files.
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index f7ea19c..5961f90 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -317,7 +317,16 @@ function run_spell_success() {
# md5sum log
message "${MESSAGE_COLOR}Creating MD5 log" \
"${FILE_COLOR}${MD5_LOG}${DEFAULT_COLOR}"
- create_md5list $TMP_INST_LOG $TMP_MD5_LOG
+ if [[ $STAGED_INSTALL == on ]]; then
+ # save the md5sums of the files in the stage and not the target
+ # ones on the system, otherwise config merging breaks #13835
+ local STAGE_INST_LOG="$TMP_DIR/$SPELL-$VERSION.stage.install"
+ create_stage_install_log $TMP_INST_LOG $STAGE_INST_LOG
+ create_md5list $STAGE_INST_LOG $TMP_MD5_LOG
+ sed -i "s#${STAGE_DIRECTORY}/TRANSL##g" $TMP_MD5_LOG
+ else
+ create_md5list $TMP_INST_LOG $TMP_MD5_LOG
+ fi
log_adjuster $TMP_MD5_LOG $MD5_LOG root log md5_log_filter

# do this before cache archive creation (bug 8249)
@@ -335,8 +344,8 @@ function run_spell_success() {
create_cache_archive $TMP_INST_LOG $CACHE $CACHE_COMP

report_install
- rm -f $IW_LOG $C_LOG $TMP_INST_LOG $TMP_MD5_LOG $spell_depends \
- "$spell_sub_depends" "$spell_rsub_depends"
+ rm -f $IW_LOG $C_LOG $TMP_INST_LOG $TMP_MD5_LOG "$STAGE_INST_LOG" \
+ "$spell_sub_depends" "$spell_rsub_depends" "$spell_depends"
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index a3dcd63..da2d5e3 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -243,6 +243,26 @@ function create_install_log() {
}

#---------------------------------------------------------------------
+##
+## Creates the install log containing all staged files. It reuses
+## the existing install log and just prepends $STAGE_DIRECTORY/TRANSL
+## to every line
+##
+## @param input log file
+## @param output log file
+##
+#---------------------------------------------------------------------
+function create_stage_install_log() {
+ debug "libtrack" "$FUNCNAME on $SPELL"
+ local input="$1"
+ local output="$2"
+
+ # the three cast logs weren't staged, but we'll deal with that
later/manually
+ sed "s#^#$STAGE_DIRECTORY/TRANSL#" "$input" > "$output"
+
+}
+
+#---------------------------------------------------------------------
## Makes a list of files with the md5sum
#---------------------------------------------------------------------
function create_md5list() {



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (e651f71f210f5f01e05cac7c6777630ac0f16122), Jaka Kranjc, 01/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page