Skip to Content.
Sympa Menu

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

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 (62a4f6fc3d19e27f6b9729c378f0b28f4ffa333d)
  • Date: Mon, 23 Feb 2009 13:24:28 -0600

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

ChangeLog | 8 +
usr/sbin/gaze | 17 +-
usr/share/man/man1/gaze.1 | 5
usr/share/man/man5/grimoire.5 | 2
usr/share/man/man5/sorcery_config.5 | 242
------------------------------------
usr/share/man/man8/cast.8 | 4
usr/share/man/man8/dispel.8 | 2
usr/share/man/man8/resurrect.8 | 2
usr/share/man/man8/scribe.8 | 2
usr/share/man/man8/sorcery_config.8 | 242
++++++++++++++++++++++++++++++++++++
var/lib/sorcery/modules/libdepends | 27 +++-
11 files changed, 293 insertions(+), 260 deletions(-)

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

gaze: removed a few avoidable forks when searching

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

gaze, gaze.1: use extended regular expressions in all search modes,
not just in some and mixed with basic REs #15080

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

sorcery_config.5: renamed and moved to section 8 #15036

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

libdepends: improve the handling of missing grimoires when a
dependency is referencing another grimoire

diff --git a/ChangeLog b/ChangeLog
index f898ce5..81b5daf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdepends: improve the handling of missing grimoires when a
+ dependency is referencing another grimoire
+ * sorcery_config.5: renamed and moved to section 8 #15036
+ * gaze, gaze.1: use extended regular expressions in all search modes,
+ not just in some and mixed with basic REs #15080
+ * gaze: removed a few avoidable forks when searching
+
2009-01-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* config: allow for an empty EXTENSION and COMPRESSBIN

diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 2fde168..585512e 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -783,7 +783,7 @@ function grep_find_grimoire() {
local name=$2
local pattern="$3"

- codex_find_in_grimoire "$path" "$name" | xargs grep -il --
"${pattern}"
+ codex_find_in_grimoire "$path" "$name" | xargs grep -ilE --
"${pattern}"
}

#-----------------------------------------------------------------------
@@ -795,15 +795,15 @@ function grep_find_grimoire() {
##
#-----------------------------------------------------------------------
function real_short_search() {
- local pattern grimoire spell spellname
+ local pattern grimoire spell spellname spelldir

for pattern in "$@"; do
for grimoire in $(codex_get_all_grimoires); do
for spell in $(
grep_find_grimoire $grimoire "DETAILS" "SHORT=.*${pattern}"
); do
-
- smgl_basename "$(smgl_dirname $spell)" spellname
+ smgl_dirname "$spell" spelldir
+ smgl_basename "$spelldir" spellname
if [[ $GAZE_VERBOSE == false ]]; then
echo $spellname
else
@@ -829,6 +829,7 @@ function real_long_search() {
local atSpell=0
local file pattern
local SEARCH SEARCH_RESULTS
+ local spelldir spellname

if ! [[ $GAZE_VERBOSE == false ]] ; then
echo "Searching... "
@@ -843,7 +844,7 @@ function real_long_search() {
let i++
done

- for file in `codex_get_all_spells | sed 's/$/\/DETAILS/' | xargs grep -il
"${SEARCH[@]}"`; do
+ for file in `codex_get_all_spells | sed 's/$/\/DETAILS/' | xargs grep -ilE
"${SEARCH[@]}"`; do
for ((i=1;i<${#SEARCH[@]};i+=2)) ; do
pattern=${SEARCH[$i]}
SEARCH_RESULTS=$(gawk 'BEGIN{ORS = ""; IGNORECASE=1; inLongDesc=0}
@@ -856,11 +857,13 @@ function real_long_search() {
/^EOF$/{inLongDesc=0;} ' $file)

if [[ ${SEARCH_RESULTS} ]]; then
+ smgl_dirname "$file" spelldir
+ smgl_basename "$spelldir" spellname
if [[ $GAZE_VERBOSE == false ]]; then
- smgl_basename $(smgl_dirname $file)
+ echo "$spellname"
else
clear_line
- echo "$pattern -> $(smgl_basename $(smgl_dirname $file) )
${SEARCH_RESULTS}"
+ echo "$pattern -> $spellname ${SEARCH_RESULTS}"
fi
fi
done
diff --git a/usr/share/man/man1/gaze.1 b/usr/share/man/man1/gaze.1
index 554363b..c4e677c 100644
--- a/usr/share/man/man1/gaze.1
+++ b/usr/share/man/man1/gaze.1
@@ -188,7 +188,8 @@ With -name searches spells name and with -short searches
spells short descriptio
.I phrase
.IP
.I phrase
-can be any valid basic regular expression. Use quotes to protect it if
needed.
+can be any valid extended regular expression. For optimal results, don't
forget to
+escape any special characters and use quotes to protect the expression.
.PP
.SS newer <date>
.IP
@@ -280,7 +281,7 @@ Maintained by the Source Mage GNU Linux Team
(http://www.sourcemage.org)
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
cast(8), cleanse(8), dispel(8), grimoire(5), scribbler(8),
-scribe(8), sorcery(8), sorcery_config(5), summon(8)
+scribe(8), sorcery(8), sorcery_config(8), summon(8)
.SH "WARRANTY"
This is free software with ABSOLUTELY NO WARRANTY

diff --git a/usr/share/man/man5/grimoire.5 b/usr/share/man/man5/grimoire.5
index de52f03..0286134 100644
--- a/usr/share/man/man5/grimoire.5
+++ b/usr/share/man/man5/grimoire.5
@@ -212,7 +212,7 @@ Maintained by the Source Mage GNU Linux Team
(http://www.sourcemage.org)
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
cast(8), cleanse(8), dispel(8), gaze(1), scribbler(8),
-scribe(8), sorcery(8), sorcery_config(5), summon(8)
+scribe(8), sorcery(8), sorcery_config(8), summon(8)
.PP
.SH "WARRANTY"
.PP
diff --git a/usr/share/man/man5/sorcery_config.5
b/usr/share/man/man5/sorcery_config.5
deleted file mode 100644
index 8f79f3a..0000000
--- a/usr/share/man/man5/sorcery_config.5
+++ /dev/null
@@ -1,242 +0,0 @@
-.TH SORCERY_CONFIG 5 "September 2004" "Source Mage GNU Linux" "File Formats"
-.SH NAME
-sorcery configuration \- reference on sorcery's configuration options
-.SH DESCRIPTION
-The sorcery scripts can be configured by a variety of options,
-best set using the
-.I sorcery
-command. The configuration files determine which features the sorcery
-source-based package management system should use and how it should behave.
-.SH "SUMMARY"
-The default configuration files are found under /etc/sorcery.
-Any local versions of these files are found under /etc/sorcery/local.
-Many of the default config files can be overridden by a local version.
-/etc/sorcery/local also contains spell configurations.
-.SH "WARNING"
-You should
-.I not
-modify any files directly in /etc/sorcery. They set vital defaults and paths.
-They will also be overwritten by every sorcery update you run.
-Therefore, you should only modify the files in /etc/sorcery/local.
-Normally, using sorcery to modify them should work fine.
-Keep in mind that if you manually change an option line to a complicated
-expression or add lines to a config file, the next time you edit the file
-using sorcery your changes will most likely be lost.
-.SH "MISC GLOBAL FILES"
-This section describes the files in /etc/sorcery.
-.PP
-.I accounts
-.IP
-contains information for sorcery on what spell needs which user to
-exist and his GIDs.
-.PP
-.I groups
-.IP
-contains the names for those groups.
-.PP
-.I version
-.IP
-contains the current version of sorcery.
-.PP
-.I internal_version
-.IP
-contains 0. It provides a quick way to check the current on-disk format
version. It has never been changed yet.
-.PP
-.I dialogrc
-.IP
-contains the options for dialog, the menu program sorcery uses.
-.PP
-.I licenses/
-.IP
-directory containing the licenses of all spells in the grimoire
-(except some in z-rejected)
-.PP
-.I mirror/
-.IP
-directory containing lists of mirrors for the sorcery mirror configuration.
-.SH "GLOBAL CONFIG FILES"
-to be done
-.SH "LOCAL MISC FILES"
-todo
-.SH "LOCAL CONFIG FILES"
-todo
-.SH "FEATURE CONFIG OPTIONS"
-.PP
-.I ARCHIVE
-.IP
-This enables a very useful feature to make sorcery create a compressed .tar
-of all files installed by a spell. If the spell breaks for some reason,
-it can be used to resurrect the spell without the need to recompile it.
-
-Use
-.I dispel -d <spell> <version>
-to resurrect from cache.
-.I cast <spell>
-will also do this, but only when the version hasn't changed.
-
-Turning this feature off will save a good amount of space (a few hundred megs
-on a desktop system), however, it will make recovering a lot harder.
-.PP
-.I AUTOFIX
-.IP
-This will make sorcery run a cleanse --fix after a sorcery upgrade,
-to check if any became broken by the update.
-.PP
-.I AUTOPRUNE
-.IP
-This will make sorcery remove old logs, sources and caches on a sorcery
upgrade.
-.PP
-.I CCACHE
-.IP
-This will create a cache of compiled files for spells,
-slowing down the first compile but speeding up upgrades by detecting which
-files have not changed. This will also consume some disk space on /var.
-.PP
-.I COLOR
-.IP
-If you have this on, you will have colorized messages.
-Turning this off will get you back to black and white.
-.PP
-.I CONFIG_LOC
-.IP
-This makes sorcery ask "do you want to add -- options to ./configure".
-This enables you to add your custom options. However, you cannot remove
-the spell's default config options.
-.PP
-.I GATHER_DOCS
-.IP
-With this option enabled, sorcery will copy any documentation it finds in the
-source to /usr/share/doc/<spell>.
-.PP
-.I MAIL_REPORTS
-.IP
-This option will run "mail" to send the compile logs (the output of a cast)
-to the email set in "Email of Sorcerer" in the Option menu.
-.PP
-.I PRESERVE
-.IP
-This option will make dispel not dispel modified config files.
-Turning this option off will cause dispel to rename them to <file>.YYYYMMDD.
-
-Note that a dispel is usually run just before a spell is installed,
-so turning this off will replace old config files with defaults, too.
-.PP
-.I SUSTAIN
-.IP
-This option will keep dispel from dispelling spells that are vital for
sorcery
-to run. Note that this can be temporally overridden by the
-.I --nosustain
-option for dispel, so there is no real reason to turn this off.
-.PP
-.I TMPFS
-.IP
-This will make sorcery create a tmpfs (ramdisk) for the sources for
-faster compilation. Note that the filesystem cache usually keeps
-much-used files in RAM anyway, so it is questionable that a speed
-increase really is achieved.
-.PP
-.I VIEW_REPORTS
-.IP
-This will prompt you at the end of a cast if want to view the compile log.
-.PP
-.I VOYEUR
-.IP
-This will filter out all the compile-time messages. While this makes the
compile
-nicer to look at, you won't get a "hey, it's doing something" feeling.
-
-.I NOTE:
-This option might also keep spell and sorcery queries from reaching you.
-If you have this off and a spell fails for mysterious reasons, try
-.I cast -V on
-<spell> to find out what's happening.
-.PP
-.I REAP
-.IP
-Turning this option off will keep sorcery from removing files in a dispel.
-This kind of takes the purpose out of dispelling, and might cause strange
-behavior in an upgrade when the files aren't overwritten for some reason
-(e.g. they moved).
-
-This can also be turned off temporarily with the
-.I --noreap
-option, so again, there is no real reason to have this one off.
-.PP
-.I NET_SELECT
-.IP
-This feature will use the "netselect" command to find which one of the
mirrors
-set for a spell has the lowest ping and therefore (hopefully) the highest
-bandwidth. Note that except for very large source files, this test may take
-longer than the actual download.
-.PP
-.I CLEAN_SOURCE
-.IP
-With this off, sorcery will leave the source directory in /usr/src if the
-spell fails, so you can figure out what went wrong.
-If you don't find yourself doing that, it is safe to turn this off.
-It will make for an uncluttered /usr/src.
-.PP
-.I CROSS_INSTALL
-.IP
-This will make sorcery attempt to build the spell for a different
architecture.
-
-.I NOTE:
-This is not really supported yet. We are working on getting this to work,
-but right now it is
-.I not recommended
-to use this option.
-.PP
-.I SET_TERM_TITLE
-.IP
-This will make cast set the terminal/screen title if run in an
-xterm/rxvt/screen.
-.SS STORE_CONF_LOG
-This will add the config.log of the build to the compile log sorcery keeps.
-The config.log is an extensive output of what was done and detected during
the
-run of ./configure. Helpful for debugging.
-.SH INSTALL_ROOT
-This section will describe the options connected with install_rooting,
-which is installing a spell to a different location.
-.SS INSTALL_ROOT
-This option describes where the spell's files should be installed to.
-Note that this is the root of that dir, so that they will probably
-end up in $INSTALL_ROOT/usr. Should not end in a "/".
-
-Note to grimoire writers: The default, when spells should be installed
-in default locations, is "".
-Take care, therefore, to use "${INSTALL_ROOT}/".
-.SS STATE_ROOT
-This option specifies the root where installed state information should go.
-This is currently /etc/sorcery/local/depends, /var/log/sorcery and
-/var/state/sorcery.
-
-If you are installing a different configuration, this should probably
-point somewhere else too so you don't get the two installations mixed up.
-.SS TRACK_ROOT
-This option specifies how files should be recorded in the install logs.
-$INSTALL_ROOT in the logs will be replaced by this.
-For a cross install, for example, this should be "/".
-
-Note to grimoire writers:
-If you for some reason (symlinks etc.) have to know where the file
-will be residing when it will be executed,
-use this variable instead of INSTALL_ROOT.
-.SS INSTALL_CACHE
-This option specifies directly where to dump the cache files
-(the .tar.bz2 of all the files the spell installed).
-This is not a root,
-so the directory you specify will be the one the files end up in.
-.SH "AUTHOR"
-Original version by Karsten Behrmann.
-.PP
-Maintained by the Source Mage GNU Linux Team (http://www.sourcemage.org)
-.SH "REPORTING BUGS"
-.PP
-Report bugs to bugzilla <http://bugs.sourcemage.org>
-.SH "SEE ALSO"
-cast(8), cleanse(8), dispel(8), gaze(1), grimoire(5),
-scribbler(8), scribe(8), sorcery(8), summon(8)
-.PP
-.SH "WARRANTY"
-.PP
-This is free software with ABSOLUTELY NO WARRANTY
-
diff --git a/usr/share/man/man8/cast.8 b/usr/share/man/man8/cast.8
index 527de38..74e9e30 100644
--- a/usr/share/man/man8/cast.8
+++ b/usr/share/man/man8/cast.8
@@ -92,7 +92,7 @@ Display short help.
.SH "ENVIRONMENT"
The environment is set using the sorcery configuration files.
See
-.I sorcery_config(5)
+.I sorcery_config(8)
.SH ADVANCED USAGE
Casting from an alternate spell cache.
.IP
@@ -129,6 +129,6 @@ Maintained by the Source Mage GNU Linux Team
(http://www.sourcemage.org)
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
alter(8), cleanse(8), confmeld(8), dispel(8), gaze(1), grimoire(5),
scribbler(8),
-scribe(8), sorcery(8), sorcery_config(5), summon(8)
+scribe(8), sorcery(8), sorcery_config(8), summon(8)
.SH "WARRANTY"
This is free software with ABSOLUTELY NO WARRANTY
diff --git a/usr/share/man/man8/dispel.8 b/usr/share/man/man8/dispel.8
index 736bd32..25cdf00 100644
--- a/usr/share/man/man8/dispel.8
+++ b/usr/share/man/man8/dispel.8
@@ -155,6 +155,6 @@ Maintained by the Source Mage GNU Linux Team
(http://www.sourcemage.org)
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
alter(8), cast(8), confmeld(8), cleanse(8), gaze(1), grimoire(5),
scribbler(8), scribe(8),
-sorcery(8), sorcery_config(5), summon(8)
+sorcery(8), sorcery_config(8), summon(8)
.SH "WARRANTY"
This is free software with ABSOLUTELY NO WARRANTY
diff --git a/usr/share/man/man8/resurrect.8 b/usr/share/man/man8/resurrect.8
index 5054f77..278be55 100644
--- a/usr/share/man/man8/resurrect.8
+++ b/usr/share/man/man8/resurrect.8
@@ -83,6 +83,6 @@ Maintained by the Source Mage GNU Linux Team
(http://www.sourcemage.org)
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
alter(8), cast(8), confmeld(8), cleanse(8), gaze(1), grimoire(5),
scribbler(8), scribe(8),
-sorcery(8), sorcery_config(5), summon(8)
+sorcery(8), sorcery_config(8), summon(8)
.SH "WARRANTY"
This is free software with ABSOLUTELY NO WARRANTY
diff --git a/usr/share/man/man8/scribe.8 b/usr/share/man/man8/scribe.8
index 5705d1b..203535f 100644
--- a/usr/share/man/man8/scribe.8
+++ b/usr/share/man/man8/scribe.8
@@ -131,6 +131,6 @@ The Source Mage GNU Linux Team <http://www.sourcemage.org>
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
alter(8), cast(8), cleanse(8), dispel(8), gaze(1), grimoire(5), scribbler(8),
-sorcery(8), sorcery_config(5), summon(8)
+sorcery(8), sorcery_config(8), summon(8)
.SH "WARRANTY"
This is free software with ABSOLUTELY NO WARRANTY
diff --git a/usr/share/man/man8/sorcery_config.8
b/usr/share/man/man8/sorcery_config.8
new file mode 100644
index 0000000..8f79f3a
--- /dev/null
+++ b/usr/share/man/man8/sorcery_config.8
@@ -0,0 +1,242 @@
+.TH SORCERY_CONFIG 5 "September 2004" "Source Mage GNU Linux" "File Formats"
+.SH NAME
+sorcery configuration \- reference on sorcery's configuration options
+.SH DESCRIPTION
+The sorcery scripts can be configured by a variety of options,
+best set using the
+.I sorcery
+command. The configuration files determine which features the sorcery
+source-based package management system should use and how it should behave.
+.SH "SUMMARY"
+The default configuration files are found under /etc/sorcery.
+Any local versions of these files are found under /etc/sorcery/local.
+Many of the default config files can be overridden by a local version.
+/etc/sorcery/local also contains spell configurations.
+.SH "WARNING"
+You should
+.I not
+modify any files directly in /etc/sorcery. They set vital defaults and paths.
+They will also be overwritten by every sorcery update you run.
+Therefore, you should only modify the files in /etc/sorcery/local.
+Normally, using sorcery to modify them should work fine.
+Keep in mind that if you manually change an option line to a complicated
+expression or add lines to a config file, the next time you edit the file
+using sorcery your changes will most likely be lost.
+.SH "MISC GLOBAL FILES"
+This section describes the files in /etc/sorcery.
+.PP
+.I accounts
+.IP
+contains information for sorcery on what spell needs which user to
+exist and his GIDs.
+.PP
+.I groups
+.IP
+contains the names for those groups.
+.PP
+.I version
+.IP
+contains the current version of sorcery.
+.PP
+.I internal_version
+.IP
+contains 0. It provides a quick way to check the current on-disk format
version. It has never been changed yet.
+.PP
+.I dialogrc
+.IP
+contains the options for dialog, the menu program sorcery uses.
+.PP
+.I licenses/
+.IP
+directory containing the licenses of all spells in the grimoire
+(except some in z-rejected)
+.PP
+.I mirror/
+.IP
+directory containing lists of mirrors for the sorcery mirror configuration.
+.SH "GLOBAL CONFIG FILES"
+to be done
+.SH "LOCAL MISC FILES"
+todo
+.SH "LOCAL CONFIG FILES"
+todo
+.SH "FEATURE CONFIG OPTIONS"
+.PP
+.I ARCHIVE
+.IP
+This enables a very useful feature to make sorcery create a compressed .tar
+of all files installed by a spell. If the spell breaks for some reason,
+it can be used to resurrect the spell without the need to recompile it.
+
+Use
+.I dispel -d <spell> <version>
+to resurrect from cache.
+.I cast <spell>
+will also do this, but only when the version hasn't changed.
+
+Turning this feature off will save a good amount of space (a few hundred megs
+on a desktop system), however, it will make recovering a lot harder.
+.PP
+.I AUTOFIX
+.IP
+This will make sorcery run a cleanse --fix after a sorcery upgrade,
+to check if any became broken by the update.
+.PP
+.I AUTOPRUNE
+.IP
+This will make sorcery remove old logs, sources and caches on a sorcery
upgrade.
+.PP
+.I CCACHE
+.IP
+This will create a cache of compiled files for spells,
+slowing down the first compile but speeding up upgrades by detecting which
+files have not changed. This will also consume some disk space on /var.
+.PP
+.I COLOR
+.IP
+If you have this on, you will have colorized messages.
+Turning this off will get you back to black and white.
+.PP
+.I CONFIG_LOC
+.IP
+This makes sorcery ask "do you want to add -- options to ./configure".
+This enables you to add your custom options. However, you cannot remove
+the spell's default config options.
+.PP
+.I GATHER_DOCS
+.IP
+With this option enabled, sorcery will copy any documentation it finds in the
+source to /usr/share/doc/<spell>.
+.PP
+.I MAIL_REPORTS
+.IP
+This option will run "mail" to send the compile logs (the output of a cast)
+to the email set in "Email of Sorcerer" in the Option menu.
+.PP
+.I PRESERVE
+.IP
+This option will make dispel not dispel modified config files.
+Turning this option off will cause dispel to rename them to <file>.YYYYMMDD.
+
+Note that a dispel is usually run just before a spell is installed,
+so turning this off will replace old config files with defaults, too.
+.PP
+.I SUSTAIN
+.IP
+This option will keep dispel from dispelling spells that are vital for
sorcery
+to run. Note that this can be temporally overridden by the
+.I --nosustain
+option for dispel, so there is no real reason to turn this off.
+.PP
+.I TMPFS
+.IP
+This will make sorcery create a tmpfs (ramdisk) for the sources for
+faster compilation. Note that the filesystem cache usually keeps
+much-used files in RAM anyway, so it is questionable that a speed
+increase really is achieved.
+.PP
+.I VIEW_REPORTS
+.IP
+This will prompt you at the end of a cast if want to view the compile log.
+.PP
+.I VOYEUR
+.IP
+This will filter out all the compile-time messages. While this makes the
compile
+nicer to look at, you won't get a "hey, it's doing something" feeling.
+
+.I NOTE:
+This option might also keep spell and sorcery queries from reaching you.
+If you have this off and a spell fails for mysterious reasons, try
+.I cast -V on
+<spell> to find out what's happening.
+.PP
+.I REAP
+.IP
+Turning this option off will keep sorcery from removing files in a dispel.
+This kind of takes the purpose out of dispelling, and might cause strange
+behavior in an upgrade when the files aren't overwritten for some reason
+(e.g. they moved).
+
+This can also be turned off temporarily with the
+.I --noreap
+option, so again, there is no real reason to have this one off.
+.PP
+.I NET_SELECT
+.IP
+This feature will use the "netselect" command to find which one of the
mirrors
+set for a spell has the lowest ping and therefore (hopefully) the highest
+bandwidth. Note that except for very large source files, this test may take
+longer than the actual download.
+.PP
+.I CLEAN_SOURCE
+.IP
+With this off, sorcery will leave the source directory in /usr/src if the
+spell fails, so you can figure out what went wrong.
+If you don't find yourself doing that, it is safe to turn this off.
+It will make for an uncluttered /usr/src.
+.PP
+.I CROSS_INSTALL
+.IP
+This will make sorcery attempt to build the spell for a different
architecture.
+
+.I NOTE:
+This is not really supported yet. We are working on getting this to work,
+but right now it is
+.I not recommended
+to use this option.
+.PP
+.I SET_TERM_TITLE
+.IP
+This will make cast set the terminal/screen title if run in an
+xterm/rxvt/screen.
+.SS STORE_CONF_LOG
+This will add the config.log of the build to the compile log sorcery keeps.
+The config.log is an extensive output of what was done and detected during
the
+run of ./configure. Helpful for debugging.
+.SH INSTALL_ROOT
+This section will describe the options connected with install_rooting,
+which is installing a spell to a different location.
+.SS INSTALL_ROOT
+This option describes where the spell's files should be installed to.
+Note that this is the root of that dir, so that they will probably
+end up in $INSTALL_ROOT/usr. Should not end in a "/".
+
+Note to grimoire writers: The default, when spells should be installed
+in default locations, is "".
+Take care, therefore, to use "${INSTALL_ROOT}/".
+.SS STATE_ROOT
+This option specifies the root where installed state information should go.
+This is currently /etc/sorcery/local/depends, /var/log/sorcery and
+/var/state/sorcery.
+
+If you are installing a different configuration, this should probably
+point somewhere else too so you don't get the two installations mixed up.
+.SS TRACK_ROOT
+This option specifies how files should be recorded in the install logs.
+$INSTALL_ROOT in the logs will be replaced by this.
+For a cross install, for example, this should be "/".
+
+Note to grimoire writers:
+If you for some reason (symlinks etc.) have to know where the file
+will be residing when it will be executed,
+use this variable instead of INSTALL_ROOT.
+.SS INSTALL_CACHE
+This option specifies directly where to dump the cache files
+(the .tar.bz2 of all the files the spell installed).
+This is not a root,
+so the directory you specify will be the one the files end up in.
+.SH "AUTHOR"
+Original version by Karsten Behrmann.
+.PP
+Maintained by the Source Mage GNU Linux Team (http://www.sourcemage.org)
+.SH "REPORTING BUGS"
+.PP
+Report bugs to bugzilla <http://bugs.sourcemage.org>
+.SH "SEE ALSO"
+cast(8), cleanse(8), dispel(8), gaze(1), grimoire(5),
+scribbler(8), scribe(8), sorcery(8), summon(8)
+.PP
+.SH "WARRANTY"
+.PP
+This is free software with ABSOLUTELY NO WARRANTY
+
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index 1717055..86dfd09 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -682,6 +682,12 @@ function real_generic_required_depends()
return 1
fi

+ # determine if we're dealing with a provider or a spell
+ local is_provider
+ if ! codex_does_spell_exist $1 &> /dev/null; then
+ is_provider=yes
+ fi
+
# see if theres another grimoire
if [[ "$4" ]] && ! [[ "$OVERRIDE_GRIMOIRES" ]] ; then
local grimoire here nothere current
@@ -697,6 +703,7 @@ function real_generic_required_depends()
done
if [[ "$here" ]] || [[ "$current" ]] ; then
if [[ "$nothere" ]] ; then
+ depends_message "$SPELL" "has $article $query_term on${is_provider+
some}" "$1" "from $4."
message "${SPELL_COLOR}$1${DEFAULT_COLOR}${CHECK_COLOR}" \
"exists in the following grimoires${DEFAULT_COLOR}" \
"${SPELL_COLOR}${4}${DEFAULT_COLOR}${CHECK_COLOR}"
@@ -720,6 +727,7 @@ function real_generic_required_depends()
fi
else
if [[ "$nothere" ]] ; then
+ depends_message "$SPELL" "has $article $query_term on${is_provider+
some}" "$1" "from $4."
message "${CHECK_COLOR}You dont have any of the grimoires" \
"${SPELL_COLOR}$4${DEFAULT_COLOR}${CHECK_COLOR}."
message "You must add at least one grimoire to satisfy the" \
@@ -754,7 +762,7 @@ function real_generic_required_depends()
fi

local target_spell
- if ! codex_does_spell_exist $1 &> /dev/null; then
+ if [[ $is_provider ]]; then
work_depends_provider "$failure_ok" "$article" \
"$query_term" "$database_term" "$@" &&
if [[ "$requested_sub_depends" ]]; then
@@ -817,6 +825,12 @@ function real_generic_optional_depends()
return 1
fi

+ # determine if we're dealing with a provider or a spell
+ local is_provider
+ if ! codex_does_spell_exist $1 &> /dev/null; then
+ is_provider=yes
+ fi
+
# see if theres another grimoire
if [[ "$5" ]] && ! [[ "$OVERRIDE_GRIMOIRES" ]] ; then
local grimoire here nothere current
@@ -831,6 +845,7 @@ function real_generic_optional_depends()
done
if [[ "$here" ]] || [[ "$current" ]] ; then
if [[ "$nothere" ]] ; then
+ depends_message "$SPELL" "has $article $query_term on${is_provider+
some}" "$1" "from $5."
message "${SPELL_COLOR}$1${DEFAULT_COLOR}${CHECK_COLOR}" \
"exists in the following grimoires${DEFAULT_COLOR}" \
"${SPELL_COLOR}${5}${DEFAULT_COLOR}${CHECK_COLOR}"
@@ -854,6 +869,7 @@ function real_generic_optional_depends()
fi
else
if [[ "$nothere" ]] ; then
+ depends_message "$SPELL" "has $article $query_term on${is_provider+
some}" "$1" "from $5."
message "${CHECK_COLOR}You dont have any of the grimoires" \
"${SPELL_COLOR}${5}${DEFAULT_COLOR}${CHECK_COLOR}."
for grimoire in $nothere ; do
@@ -880,12 +896,17 @@ function real_generic_optional_depends()
if [[ ! $here ]] && [[ ! $current ]] ; then
message "${PROBLEM_COLOR}no grimoire for $1 was
retrieved${DEFAULT_COLOR}"
message "Assuming dependency is off because it could not be met"
- private_common_depends "$1" "off" "$database_term" "$2" "$3"
+ if [[ $is_provider ]]; then
+ private_common_depends "($1)" "off" "$database_term" "$2" "$3"
+ else
+ private_common_depends "$1" "off" "$database_term" "$2" "$3"
+ fi
+ return 0
fi
fi

local target_spell
- if ! codex_does_spell_exist $1 &> /dev/null; then
+ if [[ $is_provider ]]; then
work_optional_depends_provider "$failure_ok" "$article" \
"$query_term" "$database_term" "$@" &&
if [[ "$requested_sub_depends" ]]; then



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (62a4f6fc3d19e27f6b9729c378f0b28f4ffa333d), Jaka Kranjc, 02/23/2009

Archive powered by MHonArc 2.6.24.

Top of Page