sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] BZR Change 13 to stage-root sorcery by David Brown <dmlb2000@dmlb2004>
- From: bzr AT mail.sourcemage.org
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] BZR Change 13 to stage-root sorcery by David Brown <dmlb2000@dmlb2004>
- Date: Wed, 12 Apr 2006 13:00:05 -0500
------------------------------------------------------------
revno: 13
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Wed 2006-04-12 10:52:48 -0700
message:
pulled from devel
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060412163402-a458969d50004404
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Wed 2006-04-12 09:34:02 -0700
message:
fix bug 10682
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060412162233-5d4267d942c9b71d
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Wed 2006-04-12 09:22:33 -0700
message:
fix bug 10144
=== modified file 'ChangeLog'
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2006-04-12 Andrew Stitt <astitt AT sourcemage.org>
+ * gaze: fix bug 10144, fix viewing of install queue, patch from
+ Jaka Kranjc
+ * libdispel: print message if dispel fails, bug 10682
+
2006-04-08 Andrew Stitt <astitt AT sourcemage.org>
* libdepends: add default_* functions for dependency resolution
phase, bug 10900.
=== modified file 'usr/sbin/gaze'
--- usr/sbin/gaze
+++ usr/sbin/gaze
@@ -1737,7 +1737,12 @@
pam) find_pam_aware ;;
- install-queue) display $INSTALL_QUEUE "Install queue does not exist" ;;
+ install-queue) if [[ -s $INSTALL_QUEUE ]]; then
+ $PAGER $INSTALL_QUEUE
+ else
+ message "Install queue does not exist or is empty"
+ fi
+ ;;
remove-queue) display $REMOVE_QUEUE "Remove queue does not exist" ;;
=== modified file 'var/lib/sorcery/modules/libdispel'
--- var/lib/sorcery/modules/libdispel
+++ var/lib/sorcery/modules/libdispel
@@ -353,6 +353,14 @@
activity_log "dispel" "$SPELL" "$VERSION" "success"
) &&
reap_depends
+ local rc=$?
+ if [[ "$rc" != 0 ]] ; then
+ message "${PROBLEM_COLOR}Dispel of${DEFAULT_COLOR}" \
+ "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}" \
+ "${PROBLEM_COLOR}failed!${DEFAULT_COLOR}"
+ return $rc
+ fi
+ return 0
}
#---------------------------------------------------------------------
- [SM-Commit] BZR Change 13 to stage-root sorcery by David Brown <dmlb2000@dmlb2004>, bzr, 04/12/2006
Archive powered by MHonArc 2.6.24.