Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (6fc808252c40338d7d34107eb5b0827bd2d7516a)

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 test-1.14 sorcery by Jaka Kranjc (6fc808252c40338d7d34107eb5b0827bd2d7516a)
  • Date: Sat, 6 Dec 2008 10:36:03 -0600

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 16 ++++++++++++++++
etc/sorcery/version | 2 +-
usr/sbin/cast | 12 ++++++------
usr/sbin/gaze | 12 ++++++++----
var/lib/sorcery/modules/build_api/api2 | 3 ++-
var/lib/sorcery/modules/dl_handlers/dl_git | 4 ++--
var/lib/sorcery/modules/libdispel | 2 +-
7 files changed, 36 insertions(+), 15 deletions(-)

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

1.14.2-rc6

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

cast: fixed some horizontal lines in the final output

(cherry-picked from commit bc25b71a4c316ba6deb0487df2ab259bfa350fec)

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

dl_git: properly propagate errors, the chains were broken

(cherry-picked from commit 7911ebc24f359950d0ad83076a03baf8ed4493e4)

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

cast: also save stderr in the download log, fixes #14661

(cherry-picked from commit 1dfd04aea32a01bb9fa3a80a3a7e28a69414913f)

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

libdispel: fixed a duplicate debug message in reap_state_files

(cherry-picked from commit 5bf6fd04543e51471548bac63f30c6d5f0cd7dff)

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

api2: fixed a build message

(cherry-picked from commit 52f1f1dfca8eb2a556e8f9025e74c191b6256ae0)

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

gaze: improved what/short when dealing with multiple spells #14839

(cherry-picked from commit 564b4b7db803e9526ecc572e03544098cca6e00f)

diff --git a/ChangeLog b/ChangeLog
index 769c775..e715c57 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-12-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * cast: fixed some horizontal lines in the final output
+
+2008-12-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * cast: also save stderr in the download log, fixes #14661
+ * dl_git: properly propagate errors, the chains were broken
+
+2008-12-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdispel: fixed a duplicate debug message in reap_state_files
+
+2008-12-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * api2: fixed a build message
+
+2008-12-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gaze: improved what/short when dealing with multiple spells #14839
+
2008-10-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libstate: fixed toggle_depends_status using the newer esc_str;
fixes --recast-optional
diff --git a/etc/sorcery/version b/etc/sorcery/version
index cb24931..53f11c4 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.2-rc5
+1.14.3-rc1
diff --git a/usr/sbin/cast b/usr/sbin/cast
index c79ca7e..bd37214 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -532,10 +532,10 @@ function pass_three() {
fi

if [[ $SEPARATE ]] ; then
- summon_spell "$SPELL" >"$download_log"
+ summon_spell "$SPELL" &> "$download_log"
else
lock_file $download_log
- summon_spell "$SPELL" > "$download_log"
+ summon_spell "$SPELL" &> "$download_log"
unlock_file $download_log
fi

@@ -638,7 +638,7 @@ function pass_five() {
if [ -s $CHECK_TRIGGERS_SUCCESS ] ; then
message "${DEFAULT_COLOR}"
message "${MESSAGE_COLOR}Spells that had a check_self trigger succeed:"
- message "-----------------------------------------------${SPELL_COLOR}"
+ message "---------------------------------------------${SPELL_COLOR}"
for item in `cat $CHECK_TRIGGERS_SUCCESS 2>/dev/null`; do
message "$item"
done | column
@@ -648,7 +648,7 @@ function pass_five() {
if [ -s $CHECK_TRIGGERS_FAILURE ] ; then
message "${DEFAULT_COLOR}"
message "${MESSAGE_COLOR}Spells that had a check_self trigger fail:"
- message "-----------------------------------------------${SPELL_COLOR}"
+ message "------------------------------------------${SPELL_COLOR}"
for item in `cat $CHECK_TRIGGERS_FAILURE 2>/dev/null`; do
message "$item"
done | column
@@ -703,7 +703,7 @@ function pass_five() {
if [ -s $INSTALL_QUEUE ] ; then
message "${MESSAGE_COLOR}The install queue is not empty, "
message "it still contains the following spells: "
- message "---------------------------------${PROBLEM_COLOR}"
+ message "---------------------------------------${PROBLEM_COLOR}"
for item in `cat $INSTALL_QUEUE 2>/dev/null`; do
message "$item"
done | column
@@ -723,7 +723,7 @@ function pass_five() {
if [[ $deferred_list ]]; then
message "${MESSAGE_COLOR}Cast deferred installing some configuration
files."
message "The following spells have new pending updates: "
- message "---------------------------------$SPELL_COLOR"
+ message "----------------------------------------------$SPELL_COLOR"
message "$deferred_list" | column
message "${MESSAGE_COLOR}Please run confmeld to merge them into your
system."
message "$DEFAULT_COLOR"
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 2bd9c51..dc703fe 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -1404,13 +1404,13 @@ function gaze_show_short_description() {
codex_set_current_spell_by_name $spell &&
echo $SHORT
) ||
- { message "No details found"
+ { message "No details found! Please file a bug!"
return 1
}
else
message "$spell -> no such spell"
- return 1
fi
+ if ! [[ $GAZE_VERBOSE == 0 ]]; then echo; fi
done
}

@@ -1432,12 +1432,16 @@ function gaze_show_long_description() {
codex_get_spell_description $SPELL_DIRECTORY
) ||
{
- message "No details found" &&
+ message "No details found! Please file a bug!" &&
return 1
}
else
message "$spell -> no such spell"
- return 1
+ fi
+ if [[ $GAZE_VERBOSE == 0 ]]; then
+ echo --- --- ---
+ else
+ echo
fi
done
}
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index d1ca054..94b7eac 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -155,9 +155,10 @@ function run_build() {
invoke_gcc2
optimize

- message -n "Installing in dir: "
+ message -n "Building in dir: "
pwd
message "$SPELL $VERSION"
+ message

run_spell_file BUILD build

diff --git a/var/lib/sorcery/modules/dl_handlers/dl_git
b/var/lib/sorcery/modules/dl_handlers/dl_git
index 3a8978d..e3ddd24 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_git
+++ b/var/lib/sorcery/modules/dl_handlers/dl_git
@@ -45,7 +45,7 @@ function dl_git_get () {
( cd $GIT_DIRECTORY &&
echo git checkout $GIT_TAG &&
git checkout $GIT_TAG &&
- echo git pull $GIT_ROOT $GIT_TAG
+ echo git pull $GIT_ROOT $GIT_TAG &&
git pull $GIT_ROOT $GIT_TAG )
rc=$?
eval "$dl_target=\"$GIT_DIRECTORY\""
@@ -54,7 +54,7 @@ function dl_git_get () {
echo git clone $GIT_ROOT $GIT_DIRECTORY
git clone $GIT_ROOT $GIT_DIRECTORY &&
cd $GIT_DIRECTORY &&
- echo git checkout $GIT_TAG
+ echo git checkout $GIT_TAG &&
git checkout $GIT_TAG &&
cd ../
rc=$?
diff --git a/var/lib/sorcery/modules/libdispel
b/var/lib/sorcery/modules/libdispel
index 5f73918..c123277 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -183,7 +183,7 @@ function reaper() {
function reap_state_files() {
# Example: reaper "$INSTALL_LOG" "$MD5_LOG"

- debug "libsorcery" "Running reaper() on $1"
+ debug "libsorcery" "Running reap_state_files() on $1"

local UNIQUE="$$.$RANDOM"
local REAPER_FILES="$TMP_DIR/reaper.$UNIQUE.files"



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (6fc808252c40338d7d34107eb5b0827bd2d7516a), Jaka Kranjc, 12/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page