Skip to Content.
Sympa Menu

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

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 (cb63ad2386e63b11eb775925c9bef0d477f19ae4)
  • Date: Sat, 6 Dec 2008 14:21:53 -0600

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

ChangeLog | 2 ++
usr/sbin/resurrect | 11 +++++++++--
usr/share/man/man8/resurrect.8 | 5 +++++
var/lib/sorcery/modules/libresurrect | 4 +++-
4 files changed, 19 insertions(+), 3 deletions(-)

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

resurrect, libresurrect: silence tar if VOYEUR is not enabled; added
a -V|--voyeur commandline override

diff --git a/ChangeLog b/ChangeLog
index 4700965..f61f804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2008-12-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gaze, gaze.1: overhaul of export and import, changing semantics;
initial patch by Robert Figura #14661
+ * resurrect, libresurrect: silence tar if VOYEUR is not enabled; added
+ a -V|--voyeur commandline override

2008-12-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* cast: fixed some horizontal lines in the final output
diff --git a/usr/sbin/resurrect b/usr/sbin/resurrect
index cd23249..8ec3b66 100755
--- a/usr/sbin/resurrect
+++ b/usr/sbin/resurrect
@@ -32,6 +32,7 @@ Optional Parameters:
-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)
+-V, --voyeur <on|off> toggle voyeur mode (default on)
-h, --help will just print this help

You can invoke resurrect with spell names only or also specify the desired
@@ -233,8 +234,10 @@ function verify_parameters() {
while [[ -n $1 ]]; do
if [[ ${1:0:1} == "-" ]]; then
case "$1" in
- --latest|-l|--from|-f|--check|-c|--version|-v|--nosustain) true ;;
- --help|-h|*) help ;;
+ --latest|-l|--from|-f) true ;;
+ --check|-c|--version|-v|--nosustain) true ;;
+ --voyeur|-V) list_find "on off" "$2" || help
;;
+ --help|-h|*) help ;;
esac
fi
shift
@@ -264,6 +267,10 @@ function main() {
shift
unset USE_LATEST
;;
+ --voyeur|-V) list_find "on off" "$2" || help
+ VOYEUR="$2"
+ shift
+ ;;
--nosustain) SUSTAIN="off" ;;
*) help ;;
esac
diff --git a/usr/share/man/man8/resurrect.8 b/usr/share/man/man8/resurrect.8
index 64deb4f..5054f77 100644
--- a/usr/share/man/man8/resurrect.8
+++ b/usr/share/man/man8/resurrect.8
@@ -57,6 +57,11 @@ 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 "-V, --voyeur <on|off>"
+Like in cast, the voyeur mode enables verbose output. More specifically it
+will toggle the listing of rolled-out (resurrected) files.
+
+This flag overrides the VOYEUR setting from sorcery. It can be used with any
of the above options.
.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.
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index dd4f2a7..cda39c3 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -321,6 +321,8 @@ function resurrect_sub() {
# totally screwing us if we stomp on some critical libraries.
# ld-linux.so.2 anyone?
local res_fail=0
+ local verbose
+ [[ $VOYEUR != off ]] && verbose=-v
cat $NEW_DATA_F_NC | while read line; do
# filterable data also has the clever trait that to make it relative
# in this context we prepend a .
@@ -329,7 +331,7 @@ function resurrect_sub() {
# test -d so handle them specially
test -h ".$line" && echo .$line ||
test -d ".$line" || echo .$line
- done | sort | tar -cT - | tar -xvf - -C ${INSTALL_ROOT:-/} || {
+ done | sort | tar -cT - | tar $verbose -xf - -C ${INSTALL_ROOT:-/} || {
debug "libresurrect" "Failed to install regular files"
resurrect_fail 1
return 1



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (cb63ad2386e63b11eb775925c9bef0d477f19ae4), Jaka Kranjc, 12/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page