Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Ismael Luceno (462534ea5ed61a1813b547d196615784f6103360)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Ismael Luceno (462534ea5ed61a1813b547d196615784f6103360)
  • Date: Wed, 23 May 2018 04:26:16 +0000

GIT changes to master sorcery by Ismael Luceno <ismael AT sourcemage.org>:

usr/sbin/cast | 4 +++-
usr/share/man/man1/gaze.1 | 2 +-
var/lib/sorcery/modules/libtrack | 6 ++----
3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 462534ea5ed61a1813b547d196615784f6103360
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cast: Remove bashism in the pass_one loop

commit ff138040ceb26efbeeaa09198e3dcb1097050bf7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gaze: Document the fact that "gaze website|url" takes several arguments

commit 0c0f464d13a994f0a066a8af024faa2e98df6e24
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libtrack: Fix ignored paths list building

The paths must be canonical in order for the exclusion to work, so call
readlink with the "-f" flag.

diff --git a/usr/sbin/cast b/usr/sbin/cast
index 5245827..52626bb 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -352,7 +352,8 @@ function pass_one() {
spells=( $SPELLS )
hash_reset deps_only
hash_reset looked_at
- for ((i=0;$i<${#spells[@]}; i++)); do
+ local i=0
+ while [[ $i < ${#spells[@]} ]]; do
if [[ "${spells[$i]}" ]] &&
! [[ $(hash_get looked_at "${spells[$i]}") ]] ; then
hash_put looked_at "${spells[$i]}" done
@@ -363,6 +364,7 @@ function pass_one() {
spells=( ${spells[@]} $new_spells )
unset new_spells
fi
+ let i++
done
SPELLS_TO_CAST=$(hash_get_table_fields "deps_only"|tr '\n' ' ')
hash_reset deps_only
diff --git a/usr/share/man/man1/gaze.1 b/usr/share/man/man1/gaze.1
index f30b4a3..8678434 100644
--- a/usr/share/man/man1/gaze.1
+++ b/usr/share/man/man1/gaze.1
@@ -84,7 +84,7 @@ view the short package description
.IP
display the section a spell belongs to. If -path is given, display the full
path to spell
.PP
-.SS website|url <spell>
+.SS website|url <spells>
.IP
display the URL for the specified spell
.PP
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 17792a2..b7474cd 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -102,10 +102,8 @@ function real_invoke_stage_root()
# this forks and daemonizes so it will exit you simply unmount the dir to
stop the process
for dir in ${CASTFS_UNSTAGED_PATHS} ${LOCAL_IGNORE_DIRS}
do
- if [[ -h $dir ]]; then
- CASTFS_IGNORE_LIST="${CASTFS_IGNORE_LIST} -o ignore=$(readlink $dir)"
- elif [[ -d $dir ]]; then
- CASTFS_IGNORE_LIST="${CASTFS_IGNORE_LIST} -o ignore=$dir"
+ if [[ -d $dir ]]; then
+ CASTFS_IGNORE_LIST="${CASTFS_IGNORE_LIST} -o ignore=$(readlink -f
$dir)"
else
debug "libtrack" "User wanted $FUNCNAME to treat $dir as a directory!"
fi



  • [SM-Commit] GIT changes to master sorcery by Ismael Luceno (462534ea5ed61a1813b547d196615784f6103360), Ismael Luceno, 05/23/2018

Archive powered by MHonArc 2.6.24.

Top of Page