Skip to Content.
Sympa Menu

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

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 (baea312a7cd66bea53facc288a0b59143c520a3a)
  • Date: Sun, 30 Mar 2008 07:39:31 -0500

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 | 5 ++++-
3 files changed, 21 insertions(+), 1 deletion(-)

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

libtrack: reformatted exists() and made it use a local variable

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

common: check if the iw log exists before using it in run_spell_succes

diff --git a/ChangeLog b/ChangeLog
index 014ce00..a133f65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2008-03-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libstate: added a workaround to search_depends_status_exact for
provider
functions, since they were broke after the 2008-03-26 esc_str fix
+ * common: check if the iw log exists before using it in
run_spell_succes
+ * libtrack: reformatted exists() and made it use a local variable

2008-03-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libmedia: reset the color in the CHECK_ and MESSAGE_COLOR
definitions, so
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 72d3d04..3696807 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -322,6 +322,21 @@ function run_spell_success() {
rm -f $ABANDONED_PERSIST/$SPELL.p
fi

+ # when delving late stages the installwatch log may not exist
+ if [[ $STAGED_INSTALL == off ]] && [[ ! -e $IW_LOG ]]; then
+ message "${PROBLEM_COLOR}The installwatch log does not exist!"
+ message "Skipping the creation of the cache archive, the install and
md5 log!" \
+ "$DEFAULT_COLOR"
+
+ rm_source_dir
+ if [[ $STAGED_INSTALL != off ]]
+ then
+ destroy_stage_root
+ fi
+ rm -f "$C_LOG" "$spell_sub_depends" "$spell_rsub_depends"
"$spell_depends"
+ return
+ fi
+
# install log
message "${MESSAGE_COLOR}Creating install log" \
"${FILE_COLOR}${INST_LOG}${DEFAULT_COLOR}"
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index cf24b0a..5481ba2 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -24,7 +24,10 @@ function libtrack_init() {
##
#---------------------------------------------------------------------
function exists() {
- while read ITEM; do [ -e "$ITEM" ] && echo "$ITEM"; done;
+ local item
+ while read item; do
+ [[ -e $item ]] && echo $item
+ done
}





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

Archive powered by MHonArc 2.6.24.

Top of Page