[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (5727165c0b6d6ed9f587c2ed174a6d22560bbfd9)

Jaka Kranjc scm at sourcemage.org
Sun Aug 12 08:21:50 EDT 2007


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

 ChangeLog                         |    5 +++++
 usr/sbin/gaze                     |    4 ++--
 usr/sbin/scribe                   |   11 ++++++++++-
 var/lib/sorcery/modules/libsummon |    1 +
 var/lib/sorcery/modules/liburl    |    2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 5727165c0b6d6ed9f587c2ed174a6d22560bbfd9
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    liburl, scribe: don't ignore url_get_prefix exit status #13729

commit 36b373fb73d35043b43da911482b0b05ef8a6c9b
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    libsummon, scribe: added the missing prefixes to the guess lists #13732

commit a8ce539dfdd39919e81b298a37b735948d802a3d
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    gaze: fixed bad temporary dir usage #13588

diff --git a/ChangeLog b/ChangeLog
index 039b3b8..fa62c80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-12 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* gaze: fixed bad temporary dir usage #13588
+	* libsummon, scribe: added the missing prefixes to the guess lists #13732
+	* liburl, scribe: don't ignore url_get_prefix exit status #13729
+
 2007-08-11 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* libdepends: fixed a regression in private_add_depends;
 	  probably fixes #13735
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 859f10e..968daa7 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -810,7 +810,7 @@ function specific_voyeur()
     return 1
   fi
   nice -n +20                   \
-   tail /tmp/$1.compile.log     \
+   tail $(find /tmp/sorcery/cast/ -name $1.compile.log )     \
     --follow=name --pid=$(ls "/tmp/liblock-0/cast.$1") 2>/dev/null
 }
 
@@ -1486,7 +1486,7 @@ function gaze_show_dependencies() {
     while true; do
         # Check for the compact mode flag
         if [[ $1 == -c ]] ; then
-            FOUND="/tmp/gaze.seen.$$"
+            FOUND="$TMP_DIR/gaze.seen.$$"
             echo -n > $FOUND
             shift
             continue
diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index 047d63a..aa08470 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -217,7 +217,16 @@ function scribe_add_update_worker() {
   if  [ -z "$from" ];  then
     #from is empty - use the default
     prefix=$(url_get_prefix $CODEX_URL)
-    if list_find "rsync svn cvs smgl_tla dir" $prefix ; then
+    if [[ $? != 0 ]]; then
+      message "${PROBLEM_COLOR}Failed to get the \$CODEX_URL prefix!" \
+      "${DEFAULT_COLOR}"
+      popd &>/dev/null
+      return 1
+    fi
+
+    local tree_prefixes="rsync svn svn_http svn_https svn_ssh cvs smgl_tla"
+    tree_prefixes="$tree_prefixes dir git git_http"
+    if list_find "$tree_prefixes" "$prefix"; then
       grim_target=$grim_name
     else
       grim_target="$grim_name.tar.bz2"
diff --git a/var/lib/sorcery/modules/libsummon b/var/lib/sorcery/modules/libsummon
index badeafb..973a778 100755
--- a/var/lib/sorcery/modules/libsummon
+++ b/var/lib/sorcery/modules/libsummon
@@ -402,6 +402,7 @@ function unpack_for_update() {
 
   # hard-coded list of url prefixes that generally download trees
   local tree_prefixes="cvs dir rsync smgl_tla svn svn_http svn_ssh git"
+  tree_prefixes="$tree_prefixes svn_https git_http"
   local prefix=$(url_get_prefix $url_list)
   if ! list_find "$hints" file &&
      list_find "$hints" tree || list_find "$tree_prefixes" "$prefix" ; then
diff --git a/var/lib/sorcery/modules/liburl b/var/lib/sorcery/modules/liburl
index bda5293..9465829 100755
--- a/var/lib/sorcery/modules/liburl
+++ b/var/lib/sorcery/modules/liburl
@@ -493,7 +493,7 @@ function url_generic_apifunc() {
   local tmp_func=$1
   shift
   local tmp_url=$1 tmp_prefix
-  tmp_prefix=$(url_get_prefix $1)
+  tmp_prefix=$(url_get_prefix $1) &&
   if misc_is_function url_${tmp_prefix}_${tmp_func}; then
     url_${tmp_prefix}_${tmp_func} "$@"
   else



More information about the SM-Commit mailing list