Skip to Content.
Sympa Menu

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

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 (094a652ac3097768974513ef2ffa706f5575406a)
  • Date: Wed, 3 Dec 2008 10:19:02 -0600

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

ChangeLog | 3 +++
usr/sbin/dispel | 19 +++++++++++++++----
usr/sbin/resurrect | 3 +++
usr/share/man/man8/resurrect.8 | 3 +++
var/lib/sorcery/modules/build_api/api2 | 3 ++-
var/lib/sorcery/modules/libdispel | 2 +-
6 files changed, 27 insertions(+), 6 deletions(-)

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

resurrect, resurrect.8: implemented --nosustain #14877

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

libdispel: fixed a duplicate debug message in reap_state_files

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

api2: fixed a build message

diff --git a/ChangeLog b/ChangeLog
index aef7481..e31c495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2008-12-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gaze: improved what/short when dealing with multiple spells #14839
changed the value of GAZE_VERBOSE for better readability
+ * api2: fixed a build message
+ * libdispel: fixed a duplicate debug message in reap_state_files
+ * resurrect, dispel: implemented --nosustain #14877

2008-10-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* delve: redirect messages that should be shown with VOYEUR=off too
diff --git a/usr/sbin/dispel b/usr/sbin/dispel
index 5a7ca4e..abcce03 100755
--- a/usr/sbin/dispel
+++ b/usr/sbin/dispel
@@ -81,7 +81,11 @@ EOF
## @param Previous version
#-----
function downgrade() {
- resurrect $1 -v "$2"
+ if [[ $SUSTAIN == off ]]; then
+ resurrect --nosustain $1 -v "$2"
+ else
+ resurrect $1 -v "$2"
+ fi
DISPEL_EXIT_STATUS=$?
}

@@ -105,9 +109,11 @@ function process_parameters() {
message "${PROBLEM_COLOR}Missing parameters!${DEFAULT_COLOR}"
help
fi
- downgrade $2 $3
- DISPEL_EXIT_STATUS=${DISPEL_EXIT_STATUS:-$?}
- [[ ${3:0:1} == - ]] || shift
+ DOWNGRADE_SPELL=$2
+ if [[ ${3:0:1} != - ]]; then
+ DOWNGRADE_VERSION=$3
+ shift
+ fi
shift 2
;;
--noreap) REAP="off"; shift 1 ;;
@@ -149,6 +155,11 @@ function process_parameters() {
shift
fi
done
+ # handle downgrading specially, since we also want to pass some of the
flags
+ # but can't rely on input being ordered correctly
+ if [[ -n $DOWNGRADE_SPELL ]]; then
+ downgrade $DOWNGRADE_SPELL $DOWNGRADE_VERSION
+ fi
}

function validate_param() {
diff --git a/usr/sbin/resurrect b/usr/sbin/resurrect
index dd9ea8f..2614506 100755
--- a/usr/sbin/resurrect
+++ b/usr/sbin/resurrect
@@ -30,6 +30,8 @@ Optional Parameters:
-v, --version <version> use the specified version
-f, --from <cache> resurrect from the specified cache
-c, --check <spell> check if a spell appears to be resurrectable
+--nosustain turn off dispel protection for vital spells
+ (you usually don't want to do this)
-h, --help will just print this help

You can invoke resurrect with spell names only or also specify the desired
@@ -244,6 +246,7 @@ function main() {
shift
unset USE_LATEST
;;
+ --nosustain) SUSTAIN="off" ;;
*) help ;;
esac
else
diff --git a/usr/share/man/man8/resurrect.8 b/usr/share/man/man8/resurrect.8
index ef4d609..64deb4f 100644
--- a/usr/share/man/man8/resurrect.8
+++ b/usr/share/man/man8/resurrect.8
@@ -57,6 +57,9 @@ installs the latest cached version of the spell(s)
installs from the specified caches
.SS "-c, --check <spell> [spell2] ..."
checks wether the spell(s) can be resurrected
+.SS "--nosustain"
+usually, sorcery will refuse to dispel things it vitally needs (gcc, tar,
bash, etc.).
+This flag overrides that protection. It can be used with any of the above
options.
.SS "-h, --help"
outputs short help
.SH "EXIT STATUS"
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 1d449b6..2272ffe 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -160,9 +160,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/libdispel
b/var/lib/sorcery/modules/libdispel
index c9d5042..81abb2b 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 master sorcery by Jaka Kranjc (094a652ac3097768974513ef2ffa706f5575406a), Jaka Kranjc, 12/03/2008

Archive powered by MHonArc 2.6.24.

Top of Page