sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (a53bb4735ca2d6a5204c4ea0fa99a28c5e5bbff0)
- 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 (a53bb4735ca2d6a5204c4ea0fa99a28c5e5bbff0)
- Date: Fri, 22 Feb 2008 03:13:04 -0600
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
ChangeLog | 6 ++++++
usr/sbin/gaze | 12 ++++++++----
var/lib/sorcery/modules/build_api/common | 3 ++-
3 files changed, 16 insertions(+), 5 deletions(-)
New commits:
commit a53bb4735ca2d6a5204c4ea0fa99a28c5e5bbff0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
common: better handling of empty config stages
commit c817ee0d4e06bc406d6eb71319e54f931930af0e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
gaze: don't falsely return 1 in gaze version
diff --git a/ChangeLog b/ChangeLog
index ec8e4e3..2ffe26b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * common: better handling of empty config stages
+
+2008-02-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gaze: don't falsely return 1 in gaze version
+
2008-02-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* url, compile_config: better conditional sourcing #14304
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 3eb64a2..cd8cd1b 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -1095,10 +1095,14 @@ function gaze_show_version() {
echo " "
- [ -n "$UNKNOWN" ] &&
- message "Unknown Spells or Sections" &&
- message "--------------------------" &&
- message "$UNKNOWN"
+ if [[ -n $UNKNOWN ]]; then
+ message "Unknown Spells or Sections"
+ message "--------------------------"
+ message "$UNKNOWN"
+ return 1
+ else
+ return 0
+ fi
}
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index c8803ee..debaac5 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -292,7 +292,8 @@ function run_spell_success() {
lock_file "$spell_config_stage"
if [[ $STAGED_INSTALL != "off" && -d $spell_config_stage/current ]]
then
- if ! rmdir $spell_config_stage/current $spell_config_stage
2>/dev/null;
+ rmdir $spell_config_stage/current $spell_config_stage 2>/dev/null
+ if [[ -d $spell_config_stage/current ]]
then
# check if a config we staged was already staged and if so, remove
it.
# this way users don't have to merge the same old default config
again
- [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (a53bb4735ca2d6a5204c4ea0fa99a28c5e5bbff0), Jaka Kranjc, 02/22/2008
Archive powered by MHonArc 2.6.24.