Skip to Content.
Sympa Menu

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

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 (a910f05f64daded65087bfa2a13a8fc78dcbbd83)
  • Date: Wed, 14 Nov 2007 11:19:45 -0600

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

ChangeLog | 9 +++++++++
var/lib/sorcery/excluded | 1 -
var/lib/sorcery/modules/build_api/api2 | 3 ++-
var/lib/sorcery/modules/libdepends | 2 +-
var/lib/sorcery/modules/libstate | 4 ++--
var/lib/sorcery/modules/libtrack | 9 ++++++++-
var/lib/sorcery/modules/url_handlers/url_git | 5 ++---
var/lib/sorcery/modules/url_handlers/url_git_http | 3 +--
var/lib/sorcery/modules/url_handlers/url_http | 5 ++---
9 files changed, 27 insertions(+), 14 deletions(-)

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

libstate, libtrack, url_http, url_git, url_git_http: fixed comments

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

api2: improved the message when castfs fails the sanity check

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

libtrack: disable staging when /dev/null is not a device #13315

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

libstate: fixed strictness of subdependency matching on removal #13993

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

libdepends: removed extra space from the subdepends message #13992

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

excluded: removed /var/yp - the one spell that uses it, installs config
files there #11831

diff --git a/ChangeLog b/ChangeLog
index 88e6b88..a50dbab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * excluded: removed /var/yp - the one spell that uses it, installs
config
+ files there #11831
+ * libdepends: removed extra space from the subdepends message #13992
+ * libstate: fixed strictness of subdependency matching on removal
#13993
+ * libtrack: disable staging when /dev/null is not a device #13315
+ * api2: improved the message when castfs fails the sanity check
+ * libstate, libtrack, url_http, url_git, url_git_http: fixed comments
+
2007-10-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdepends: fixed some more quoting regressions since stable. Should
eliminate some bad provider query defaults
diff --git a/var/lib/sorcery/excluded b/var/lib/sorcery/excluded
index 27eab72..98e5b79 100755
--- a/var/lib/sorcery/excluded
+++ b/var/lib/sorcery/excluded
@@ -43,5 +43,4 @@
^/var/state
^/var/tmp
^/var/www
-^/var/yp
^/usr/lib/perl.*/.*/.*-linux-thread-multi/perllocal\.pod
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 2fcbef1..45fd0a6 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -67,7 +67,8 @@ function run_build_spell() {

if [[ $STAGED_INSTALL == on ]] && ! run_castfs_sanity
then
- message "${PROBLEM_COLOR}CastFS failed sanity check turning
off${DEFAULT_COLOR}"
+ message "${PROBLEM_COLOR}CastFS failed the sanity check, staging
disabled!"
+ message -n "$DEFAULT_COLOR"
export STAGED_INSTALL=off
fi

diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index 808c646..83096e5 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -1303,7 +1303,7 @@ function real_sub_depends() {
local sub_depends=$2

message "${SPELL}${DEFAULT_COLOR}" "requests" "$sub_dependee" \
- "${CHECK_COLOR} with ${SPELL_COLOR}$sub_depends${DEFAULT_COLOR}"
+ "${CHECK_COLOR}with ${SPELL_COLOR}$sub_depends${DEFAULT_COLOR}"

# Check if the sub-depends is already known
if spell_ok $sub_dependee; then
diff --git a/var/lib/sorcery/modules/libstate
b/var/lib/sorcery/modules/libstate
index 0fb6af7..9f59f28 100755
--- a/var/lib/sorcery/modules/libstate
+++ b/var/lib/sorcery/modules/libstate
@@ -332,7 +332,7 @@ function remove_sub_depends() {
a1=${a1:-.*}; a2=${a2:-.*}; a3=${a3:-.*}

# FIXME LOCK
- sedit "/^$a1:$a2:$a3/D" "$file"
+ sedit "/^$a1:$a2:$a3$/D" "$file"
}

#---------------------------------------------------------------------
@@ -570,7 +570,7 @@ function search_spell_status() {
## a version.
##
## Prints out the matching spell's status
-## Returns 1 only for critical problems ( missing SPELL_STAUS file )
+## Returns 1 only for critical problems ( missing SPELL_STATUS file )
## 0 for all other cases ( even when spell is not found )
##
#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index d09b927..ae3594b 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -8,7 +8,7 @@
#---------------------------------------------------------------------
##
## Initialize libtrack, currently this is just the modified files list.
-## This is used by cast to exclude files its modified from the md5 list.
+## This is used by cast to exclude files it's modified from the md5 list.
##
#---------------------------------------------------------------------
function libtrack_init() {
@@ -59,6 +59,13 @@ function run_castfs_sanity()
export CASTFS_LOGFILE=${CASTFS_DBGLOG}
export CASTFS_DBGLVL=${CASTFS_DEBUG_LEVEL}
debug "libtrack" "$FUNCNAME on $SPELL"
+
+ # first check if /dev/null is really a character device #13315
+ if [[ ! -c /dev/null ]]; then
+ debug "libtrack" "$FUNCNAME failure: damaged /dev/null"
+ return 1
+ fi
+
mkdir -p "${TMP_DIR}/test-mount" &&
mkdir -p "${TMP_DIR}/test-stage" &&
castfs "${TMP_DIR}/test-mount" -o "stage=${TMP_DIR}/test-stage" -o
"ignore=/tmp" &&
diff --git a/var/lib/sorcery/modules/url_handlers/url_git
b/var/lib/sorcery/modules/url_handlers/url_git
index 8ec6eac..b90eee6 100755
--- a/var/lib/sorcery/modules/url_handlers/url_git
+++ b/var/lib/sorcery/modules/url_handlers/url_git
@@ -45,9 +45,8 @@ function url_git_crack() {

#---------------------------------------------------------------------
##=item url_git_bucketize <url>
-##
-## Verifies the specified git url. Returns true if the url exists
-## OR if the url is an empty string.
+##
+## echoes the download handler - git
##
#---------------------------------------------------------------------
function url_git_bucketize() {
diff --git a/var/lib/sorcery/modules/url_handlers/url_git_http
b/var/lib/sorcery/modules/url_handlers/url_git_http
index 478fc48..99202b2 100755
--- a/var/lib/sorcery/modules/url_handlers/url_git_http
+++ b/var/lib/sorcery/modules/url_handlers/url_git_http
@@ -46,8 +46,7 @@ function url_git_http_crack() {
#---------------------------------------------------------------------
##=item url_git_bucketize <url>
##
-## Verifies the specified git url. Returns true if the url exists
-## OR if the url is an empty string.
+## echoes the download handler - git
##
#---------------------------------------------------------------------
function url_git_http_bucketize() {
diff --git a/var/lib/sorcery/modules/url_handlers/url_http
b/var/lib/sorcery/modules/url_handlers/url_http
index 912753a..3543ed8 100755
--- a/var/lib/sorcery/modules/url_handlers/url_http
+++ b/var/lib/sorcery/modules/url_handlers/url_http
@@ -22,9 +22,8 @@

#---------------------------------------------------------------------
##=item url_http_bucketize <url>
-##
-## Verifies the specified http url. Returns true if the url exists
-## OR if the url is an empty string.
+##
+## echoes the download handler - wget
##
#---------------------------------------------------------------------
function url_http_bucketize() {



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (a910f05f64daded65087bfa2a13a8fc78dcbbd83), Jaka Kranjc, 11/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page