Skip to Content.
Sympa Menu

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

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 (b17965d677c7dd1309252c07c5d7c32235f7c911)
  • Date: Wed, 24 Apr 2013 09:57:28 -0500

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

ChangeLog | 5 +++++
etc/sorcery/config | 2 +-
var/lib/sorcery/modules/libgrimoire | 6 +++---
3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit b17965d677c7dd1309252c07c5d7c32235f7c911
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 f8046a176810b4c28b1e80b91835765057f106ac
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

added Changelog entry for 3b8b4d59cf5

commit 3b8b4d59cf58eef5ce97e4106433d2e40c336684
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>

diff --git a/ChangeLog b/ChangeLog
index c1f6802..96d9be6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/etc/sorcery/config b/etc/sorcery/config
index 1bf52de..6e212c3 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -200,7 +200,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/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




  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (b17965d677c7dd1309252c07c5d7c32235f7c911), Jaka Kranjc, 04/24/2013

Archive powered by MHonArc 2.6.24.

Top of Page