Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.15 sorcery by Jaka Kranjc (7d8052cce8a8c7470bf6c16027405f1af3ee78dd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to test-1.15 sorcery by Jaka Kranjc (7d8052cce8a8c7470bf6c16027405f1af3ee78dd)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test-1.15 sorcery by Jaka Kranjc (7d8052cce8a8c7470bf6c16027405f1af3ee78dd)
  • Date: Tue, 3 Feb 2015 16:11:02 -0600
GIT changes to test-1.15 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 14 ++++++++++++++
build | 2 +-
etc/sorcery/config | 2 +-
etc/sorcery/version | 2 +-
usr/sbin/cleanse | 7 ++++---
usr/sbin/gaze | 4 ++--
var/lib/sorcery/modules/libgrimoire | 6 +++---
var/lib/sorcery/modules/libtablet | 17 +++++++++--------
8 files changed, 35 insertions(+), 19 deletions(-)

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

version bump

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

libtablet: avoid tablet errors corrupting the version cache #553

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

gaze: orphans should not ignore runtime dependencies #570

commit 080957f214daedacedfa2adbbbaadcfd54b25517
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

cleanse: prune_depends: Do not emit empty dispel or cast lists

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

build: popd apparently had a change of semantics

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

increased the default tmpfs size to 2G; should fix bug #447

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

added Changelog entry for 3b8b4d59cf5

commit 1be7ba9328d8944322456a5aeb8696cc1352b6b2
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

ensure $SORCERY_PATH is the first path so sorcery bins are not overridden

Signed-off-by: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

commit e808e3dd08a0846d5ad838c3628c1c45c1c19262
Author: Robert Figura <template AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libtablet: Fix typo and #378: Don't trash tablet cache right after
creating

diff --git a/ChangeLog b/ChangeLog
index cb053fe..bea7658 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2015-02-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gaze: orphans should not ignore runtime dependencies #570
+ patch from Remko van der Vossen
+ * libtablet: avoid tablet errors corrupting the version cache #553
+
+2013-04-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * ensure sorcery tools are always first in PATH, to prevent conflicts
+ (delve is also in xapian-core), patch by Sukneet Basuta #506
+ * increased the default tmpfs size to 2G; should fix #447
+
+2013-04-22 Robert Figura <template AT sourcemage.org>
+ * libtablet: Fix typo and issue #378: Don't trash tablet cache right
+ after creating it
+
2012-08-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* sorcery: only look at spec files when scanning architectures #438

diff --git a/build b/build
index acd9ec0..91fe886 100755
--- a/build
+++ b/build
@@ -23,7 +23,7 @@ build__find_non_volatile sorcery > $NAMES_TMP
tar --owner=0 --group=0 -cvjf sorcery-${branch_name}.tar.bz2 -T $NAMES_TMP
rm $NAMES_TMP
rm sorcery
-popd .. &>/dev/null
+popd &>/dev/null

#---------------------------------------------------------------------
##=back
diff --git a/etc/sorcery/config b/etc/sorcery/config
index 1f21ce2..4a47dfd 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -199,7 +199,7 @@ CASTFS_UNSTAGED_PATHS="/dev /proc /tmp /var/tmp /sys
${BUILD_DIRECTORY} ${SGL_LI
CASTFS_DEBUG_LEVEL=${CASTFS_DEBUG_LEVEL:=255}

# this makes appending the sorcery path idempotent
-[ -z ${PATH##*$SORCERY_PATH*} ] || export PATH="$PATH:$SORCERY_PATH"
+[ -z ${PATH##$SORCERY_PATH*} ] || export PATH="$SORCERY_PATH:$PATH"

optimize
umask $UMASK >/dev/null
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 42cf067..c7b68b3 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.15.2
+1.15.4-rc1
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index d171875..d77bd08 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -364,7 +364,6 @@ function prune_depends()
fi
done

-
if [[ ${provider} ]] ; then
message -n "$provider "
if [[ $3 == suggest ]] || [[ $3 == runtime ]]; then
@@ -434,8 +433,10 @@ function prune_depends()
return 0
fi
t=$(date +%Y%m%d%s)
- echo dispel $prune_dispel > $BACKUPDIR/prune.$t
- echo cast -c $prune_cast >> $BACKUPDIR/prune.$t
+ [ "$prune_dispel" ] &&
+ echo dispel $prune_dispel > $BACKUPDIR/prune.$t
+ [ "$prune_cast" ] &&
+ echo cast -c $prune_cast >> $BACKUPDIR/prune.$t
cat $BACKUPDIR/prune.$t
message "For future reference, lines are stored in $BACKUPDIR/prune.$t"
fi
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 1329f2b..1852432 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -981,7 +981,7 @@ function gaze_activate_voyeur() {
#-----
function show_orphans() {
local spell each
- compute_reverse_installed_depends my_hash
+ compute_reverse_installed_depends my_hash all
for each in $(get_all_spells_with_status ok); do
hash_get_ref my_hash $each spell
if [[ ! $spell ]]; then
@@ -995,7 +995,7 @@ function show_orphans() {
#-----
function show_non_orphans() {
local spell each
- compute_reverse_installed_depends my_hash
+ compute_reverse_installed_depends my_hash all
for each in $(get_all_spells_with_status ok); do
hash_get_ref my_hash $each spell
if [[ $spell ]]; then
diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index 0738b5b..4bc2d24 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -26,20 +26,20 @@
##
## mk_source_dir $SOURCE_DIRECTORY 2g
##
-## Example2: Create a mount at /tmp/newdir, defaults to 1GB size
+## Example2: Create a mount at /tmp/newdir, defaults to 2GB size
##
## mk_source_dir /tmp/newdir
## </pre>
#---------------------------------------------------------------------
function real_mk_source_dir() {

- debug "libgrimoire" "Running mk_source_dir() on ${1:-SOURCE_DIRECTORY}
with size ${2:-1g}"
+ debug "libgrimoire" "Running mk_source_dir() on ${1:-SOURCE_DIRECTORY}
with size ${2:-2g}"

local NEW_DIR=$1
local NEW_DIR=${NEW_DIR:=$SOURCE_DIRECTORY}

local SIZE=$2
- local SIZE=${SIZE:=1g}
+ local SIZE=${SIZE:=2g}

if [ -n "$NEW_DIR" ]; then

diff --git a/var/lib/sorcery/modules/libtablet
b/var/lib/sorcery/modules/libtablet
index 9950187..c05fad0 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -339,7 +339,7 @@ function tablet_unload_roots() {
function tablet_get_tb_version() {
local tb_dir=$1
if ! [[ $tb_dir ]] ; then
- message "nothing passed in!"
+ error_message "nothing passed in!"
return 1
fi
if ! test -f $tb_dir/tb_version ||
@@ -348,7 +348,7 @@ function tablet_get_tb_version() {
fi
local ____tb_version=$(<$tb_dir/tb_version)
if test $____tb_version -gt $TABLET_MAX_VERSION; then
- message "${PROBLEM_COLOR}This sorcery is too old for tablet version" \
+ error_message "${PROBLEM_COLOR}This sorcery is too old for tablet
version" \
"$tb_version! Please update to the newer version of sorcery" \
"or recast this spell${DEFAULT_COLOR}"
return 255
@@ -750,11 +750,12 @@ function tablet_create_version_cache() {
local ok_spells=( $(get_all_spells_with_status ok) )

for spell in ${ok_spells[@]}; do
- if tablet_find_spell_dir $spell page_dir; then
- tablet_get_version $page_dir version
- tablet_get_patchlevel $page_dir patchlevel
- tablet_get_security_patch $page_dir security_patch
- tablet_get_updated $page_dir updated
+ # make sure we don't get any rare errors into our carefully crafted list
+ if tablet_find_spell_dir $spell page_dir > /dev/null; then
+ tablet_get_version $page_dir version > /dev/null
+ tablet_get_patchlevel $page_dir patchlevel > /dev/null
+ tablet_get_security_patch $page_dir security_patch > /dev/null
+ tablet_get_updated $page_dir updated > /dev/null
echo "$spell ${version:-0} ${patchlevel:-0} ${security_patch:-0}
${updated:-0}"
elif [[ $spell == alter ]]; then
version=$(installed_version alter)
@@ -771,7 +772,7 @@ function tablet_create_version_cache() {

# we can't set rc inside the loop, since it is in a subshell and
# the rc of break 13 still does not match what is documented in bash 4.2.24
- if [[ ${#ok_spells[@]} != $(wc -l $file) ]]; then
+ if [[ ${#ok_spells[@]} != $(wc -l < $file) ]]; then
rm $file
return 1
fi


  • [SM-Commit] GIT changes to test-1.15 sorcery by Jaka Kranjc (7d8052cce8a8c7470bf6c16027405f1af3ee78dd), Jaka Kranjc, 02/03/2015

Archive powered by MHonArc 2.6.24.

Top of Page