Skip to Content.
Sympa Menu

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

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 (477a7539a11f70471501d5ef4a1458bb9ad2e03b)
  • Date: Wed, 30 Jan 2008 07:14:49 -0600

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

ChangeLog | 4 ++++
var/lib/sorcery/modules/build_api/common | 14 ++++++++++----
var/lib/sorcery/modules/libtrack | 8 ++++++--
3 files changed, 20 insertions(+), 6 deletions(-)

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

common, libtrack: preserve the old behaviour and include all logs in the
md5 log (flak from #13835)

diff --git a/ChangeLog b/ChangeLog
index 1c582f5..05164a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * common, libtrack: preserve the old behaviour and include all logs
in the
+ md5 log (flak from #13835)
+
2008-01-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* local/README: fixed typo
* confmeld, libressurect: improved the merge message for better
readability
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 5961f90..3094c7b 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -309,6 +309,16 @@ function run_spell_success() {
# reformatted to "log" format (see log_adjuster in libtrack for details)
# but basically replacing INSTALL_ROOT with TRACK_ROOT
create_install_log $IW_LOG $TMP_INST_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
+ # for this we need an "install" log of what is in the stage
+ local STAGE_INST_LOG="$TMP_DIR/$SPELL-$VERSION.stage.install"
+ create_stage_install_log $TMP_INST_LOG $STAGE_INST_LOG
+ if [[ $tablet_dir ]] ; then
+ find $tablet_dir >> $STAGE_INST_LOG
+ fi
+ fi
if [[ $tablet_dir ]] ; then
find $tablet_dir >> $TMP_INST_LOG
fi
@@ -318,10 +328,6 @@ function run_spell_success() {
message "${MESSAGE_COLOR}Creating MD5 log" \
"${FILE_COLOR}${MD5_LOG}${DEFAULT_COLOR}"
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
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index da2d5e3..7eddc8f 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -257,8 +257,12 @@ function create_stage_install_log() {
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"
+ # treat the logs specially, as they weren't staged
+ grep -v "$C_LOG_COMP\|$MD5_LOG\|$INST_LOG" "$input" > "$output"
+ sed -i "s#^#$STAGE_DIRECTORY/TRANSL#" "$output"
+ echo "$C_LOG_COMP" >> "$output"
+ echo "$MD5_LOG" >> "$output"
+ echo "$INST_LOG" >> "$output"

}




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

Archive powered by MHonArc 2.6.24.

Top of Page