Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

 ChangeLog                                         |   25 +++++
 etc/sorcery/url                                   |    8 -
 etc/sorcery/version                               |    2 
 usr/sbin/delve                                    |    2 
 usr/share/man/man8/delve.8                        |   95 
++++++++++++++++++++++
 var/lib/sorcery/modules/dl_handlers/dl_git        |   27 ++++--
 var/lib/sorcery/modules/dl_handlers/dl_svn        |   10 +-
 var/lib/sorcery/modules/libdepends                |    2 
 var/lib/sorcery/modules/url_handlers/url_git      |    4 
 var/lib/sorcery/modules/url_handlers/url_git_http |    4 
 10 files changed, 157 insertions(+), 22 deletions(-)

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

    1.14.4-rc1

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

    delve.8: added delve manpage based on the draft in #15094 by Donald
              Johnson

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

    dl_git: updated for newer git, initial patch from Andraž Levstik #15208

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

    url_*: fixed url_verify_* to not break on empty optional parameters
    
    (cherry-picked from commit d8083d4b6d3848d053a2cd72ff6dd21b673865c7)

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

    dl_svn: check the prefix of the correct url

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

    dl_svn: support the no-check-certificate source hint #15045

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

    dl_svn: don't pass --no-interactive twice or never in some cases

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

    libdepends: fixed show_up_depends not printing matches that are also
              providers

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

    delve: fixed typo in help

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

    url: removed dead fallback urls
    
    (cherry-picked from commit ab7fa5721935cec96561dba944fc7dd0c9179b06)

diff --git a/ChangeLog b/ChangeLog
index 9be40a5..5dff82b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2009-05-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * delve.8: added delve manpage based on the draft in #15094 by Donald
+         Johnson
+
+2009-05-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * url_*: fixed url_verify_* to not break on empty optional parameters
+       * dl_git: updated for newer git, initial patch from Andraž Levstik 
#15208
+
+2009-04-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * dl_svn: check the prefix of the correct url
+
+2009-04-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * dl_svn: don't pass --no-interactive twice or never in some cases
+         support the no-check-certificate source hint #15045
+
+2009-04-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libdepends: fixed show_up_depends not printing matches that are also
+         providers
+
+2009-03-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * delve: fixed typo in help
+
+2009-02-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * url: removed dead fallback urls
+
 2008-12-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * libtrack: avoid an installwatch issue in create_install_log #14835
 
diff --git a/etc/sorcery/url b/etc/sorcery/url
index 1121fb7..a67f6be 100755
--- a/etc/sorcery/url
+++ b/etc/sorcery/url
@@ -11,11 +11,9 @@
                #
                # Set FURLNUM to nr. of fallback urls.
                #
-               FURLNUM=4
-FALLBACK_URL_MIRROR[0]=http://smgl.positivism.org
-FALLBACK_URL_MIRROR[1]=ftp://thefrayedknot.armory.com/sorcery
-FALLBACK_URL_MIRROR[2]=http://download.sourcemage.org/mirror
-FALLBACK_URL_MIRROR[3]=http://shlrm.org/sourcemage
+               FURLNUM=2
+FALLBACK_URL_MIRROR[0]=http://download.sourcemage.org/mirror
+FALLBACK_URL_MIRROR[1]=http://shlrm.org/sourcemage
 
       # specify default fallback url.
       LEAPFORWARD_URL=${LEAPFORWARD_URL:=""}
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 00e6e7c..4b9d466 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.3-rc3
+1.14.4-rc1
diff --git a/usr/sbin/delve b/usr/sbin/delve
index 9598b9d..a1dd429 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -26,7 +26,7 @@ delve spellname SPELL_FILE [... SPELL_FILE]
 delve spellname success|failure
 delve spellname all
 
-Paramters
+Parameters
 
 -f | --force                    Continue running files even if one fails
                                 (use with caution!)
diff --git a/usr/share/man/man8/delve.8 b/usr/share/man/man8/delve.8
new file mode 100755
index 0000000..8175001
--- /dev/null
+++ b/usr/share/man/man8/delve.8
@@ -0,0 +1,95 @@
+.TH DELVE "8" "MAY 2009" "Source Mage GNU Linux" "System Administration"
+.SH NAME
+delve \- a tool that allows the running of single spell files through the
+build and install phases of the casting process.
+.SH SYNOPSIS
+.B delve
+.RB [ \-f ]
+.IR spellname\ SPELL_FILE
+.RI [ ...\ SPELL_FILE ]
+
+.B delve
+.IR spellname \ success|failure
+
+.BI delve \ spellname 
+.R all
+
+.B delve [\-f] \-c
+.I start end spellname
+.SH DESCRIPTION
+.I delve
+.R is a low level tool that normally should not be used as it can harm your
+system when done improperly. It allows the running and stepping through
+single spell build and install files that cast runs continuously.
+
+But it is useful in some instances, such as resuming failed builds,
+circumventing dependency requirements or for custom package builds. For
+example, one could type
+.B delve -c start config_loc spellname 
+.R do some changes to the source, compile the spell manually and then 
continue off with
+.B delve -c PRE_INSTALL end 
+.BR spellname .
+.R Please do not complain if your system breaks after using this.
+
+When one needs to do something special, they should consider if that change
+can be useful to others and file a bug report if that is so.
+
+.SS SPELL STATES
+.B spell states
+.R are stages in which a spell carries out certain actions. For example,
+.B PRE_BUILD
+.R will unpack and verify the sources of the spell.
+
+The spell states go, in order of precedency by API:
+
+.B API1=
+.R \*(lqstart PRE_BUILD config_loc BUILD POST_BUILD POST_INSTALL TRIGGERS 
end\*(rq
+
+.B API2=
+.R \*(lqstart PRE_BUILD config_loc BUILD PRE_INSTALL INSTALL INSTALL_EXTRAS 
POST_INSTALL TRANSFER FINAL TRIGGERS end\*(rq
+
+.R API2 is the default API. Consult
+.BR grimoire (5)
+.R for more information on the spell states.
+
+.SS NON-FILE STATES
+.B start
+.R is an empty state that will always go onto the next spell state.
+
+.B config_loc
+.R is a state which will ask if one wants to add custom
+.B ./configure
+.R flags only if
+.B CONFIG_LOC
+.R is enabled in the Sorcery Features menu and the source uses configure,
+otherwise it is an empty state.
+
+.BR success \ and \ failure
+.R are substates of end.
+
+.B end
+.R runs success if all the run states were successful, otherwise
+failure (internal sorcery functions).
+.PP
+.SH OPTIONS
+\-f,\-\-force
+.RS
+.R Continue to run all files even if one fails
+.RE
+\-c, \-\-continue
+.I start end
+.RS
+Run all files from the start step to the end step.
+.SH AUTHOR
+Written by Donald Johnson.
+
+Maintained by the Source Mage GNU Linux Team (http://www.sourcemage.org/).
+.SH REPORTING BUGS
+Report bugs to bugzilla <http://bugs.sourcemage.org/>.
+.SH SEE ALSO
+.BR cast (8),
+.BR sorcery (8),
+.BR alter (8),
+.BR grimoire (5)
+.SH WARRANTY
+This is free software with ABSOLUTELY NO WARRANTY.
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_git 
b/var/lib/sorcery/modules/dl_handlers/dl_git
index e3ddd24..d6e7d4b 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_git
+++ b/var/lib/sorcery/modules/dl_handlers/dl_git
@@ -43,10 +43,21 @@ function dl_git_get () {
     if test -d $GIT_DIRECTORY; then
       message "${MESSAGE_COLOR}Running git pull...${DEFAULT_COLOR}"
       ( cd $GIT_DIRECTORY &&
-      echo git checkout $GIT_TAG &&
-      git checkout $GIT_TAG &&
-      echo git pull $GIT_ROOT $GIT_TAG &&
-      git pull $GIT_ROOT $GIT_TAG )
+      match=$(git branch | grep -F " $GIT_TAG"; true) &&
+      if [[ $match ]]; then
+        # no need to checkout a branch if we're already on it
+        if [[ ${match:0:1} != '*' ]]; then
+          echo git checkout $GIT_TAG &&
+          git checkout $GIT_TAG
+        else
+          # already on the correct branch
+        fi
+      else
+        echo git checkout -b $GIT_TAG origin/$GIT_TAG &&
+        git checkout -b $GIT_TAG origin/$GIT_TAG
+      fi
+      echo git pull &&
+      git pull )
       rc=$?
       eval "$dl_target=\"$GIT_DIRECTORY\""
     else
@@ -54,10 +65,12 @@ function dl_git_get () {
       echo git clone $GIT_ROOT $GIT_DIRECTORY
       git clone $GIT_ROOT $GIT_DIRECTORY &&
       cd $GIT_DIRECTORY &&
-      echo git checkout $GIT_TAG &&
-      git checkout $GIT_TAG &&
-      cd ../
+      if ! git branch | grep -qF " $GIT_TAG"; then
+        echo git checkout -b $GIT_TAG origin/$GIT_TAG &&
+        git checkout -b $GIT_TAG origin/$GIT_TAG
+      fi
       rc=$?
+      cd ../
       eval "$dl_target=\"$GIT_DIRECTORY\""
     fi
     [[ $rc == 0 ]] && break
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_svn 
b/var/lib/sorcery/modules/dl_handlers/dl_svn
index cd71806..4f6471c 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_svn
+++ b/var/lib/sorcery/modules/dl_handlers/dl_svn
@@ -43,13 +43,17 @@ function dl_svn_get () {
       local SVN_ROOT=$(echo $SVN_ROOT|sed 's#//\(.*\)@#//#')
       local USER=${USER_PASS%:*};
       local PASS=${USER_PASS#*:};
-      svn_args="--username $USER --password $PASS "
+      svn_args="$svn_args --username $USER --password $PASS"
+    fi
+
+    if list_find "$hints" no-check-certificate && [[ $(url_get_prefix 
"$url") == svn_https ]]; then
+      svn_args="$svn_args --trust-server-cert"
     fi
 
     if test -d $target; then
       message "${MESSAGE_COLOR}Running svn update...${DEFAULT_COLOR}"
-      echo svn update $svn_args --non-interactive -r $SVN_TAG $target
-      svn update $svn_args --non-interactive -r $SVN_TAG $target
+      echo svn update $svn_args -r $SVN_TAG $target
+      svn update $svn_args -r $SVN_TAG $target
       rc=$?
       eval "$dl_target=\"$target\""
     else
diff --git a/var/lib/sorcery/modules/libdepends 
b/var/lib/sorcery/modules/libdepends
index 37c1638..929ba87 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -1636,7 +1636,7 @@ function real_show_up_depends()
     if [[ "$type" == "verbose" ]] ; then
       lock_file "$DEPENDS_STATUS"
       show_up_depends_sub "$1"|while read line; do
-        grep "$line:" "$DEPENDS_STATUS"
+        grep -E "$line(\(.*\))*:" "$DEPENDS_STATUS"
       done
       unlock_file "$DEPENDS_STATUS"
     else
diff --git a/var/lib/sorcery/modules/url_handlers/url_git 
b/var/lib/sorcery/modules/url_handlers/url_git
index 8934911..f07dd76 100755
--- a/var/lib/sorcery/modules/url_handlers/url_git
+++ b/var/lib/sorcery/modules/url_handlers/url_git
@@ -61,9 +61,9 @@ function url_git_bucketize() {
 ##
 #---------------------------------------------------------------------
 function url_git_verify() {
-  local  URL GIT_ROOT GIT_DIRECTORY GIT_TAG item
+  local URL GIT_ROOT item
   url_git_crack $1
-  for item in URL GIT_ROOT GIT_DIRECTORY GIT_TAG ; do
+  for item in URL GIT_ROOT; do
     if ! [[ ${!item} ]] ; then
       return 1
     fi
diff --git a/var/lib/sorcery/modules/url_handlers/url_git_http 
b/var/lib/sorcery/modules/url_handlers/url_git_http
index 12765a2..c88e073 100755
--- a/var/lib/sorcery/modules/url_handlers/url_git_http
+++ b/var/lib/sorcery/modules/url_handlers/url_git_http
@@ -61,9 +61,9 @@ function url_git_http_bucketize() {
 ##
 #---------------------------------------------------------------------
 function url_git_http_verify() {
-  local  URL GIT_ROOT GIT_DIRECTORY GIT_TAG item
+  local URL GIT_ROOT item
   url_git_http_crack $1
-  for item in URL GIT_ROOT GIT_DIRECTORY GIT_TAG ; do
+  for item in URL GIT_ROOT; do
     if ! [[ ${!item} ]] ; then
       return 1
     fi