[SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (5b415b95528d7016652aaf944c1551e7eae2c87a)

Jaka Kranjc scm at sourcemage.org
Wed Aug 20 13:12:48 EDT 2008


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

 ChangeLog                                  |   10 ++++++++++
 etc/sorcery/version                        |    2 +-
 usr/sbin/confmeld                          |    2 ++
 usr/sbin/gaze                              |    2 +-
 var/lib/sorcery/modules/dl_handlers/dl_git |   16 ++++++++--------
 5 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit 5b415b95528d7016652aaf944c1551e7eae2c87a
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    1.14.1-rc6

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

    dl_git: use the multicall git binary; the hardlinks aren't available
          by default anymore from 1.6 on #14648
    
    (cherry-picked from commit 95fdfa8353c574a710779cd034b646f7e768679a)

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

    gaze: search now returns only one instance of every match
    
    (cherry-picked from commit 9ff01f0cc4d31b3b60b61702681f1894af76611f)

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

    confmeld: make sure the config stage dir exists
    
    (cherry-picked from commit aabac43a741c6633dbaa415d8b72a534071ee096)

diff --git a/ChangeLog b/ChangeLog
index d0358b2..f6b3cb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-20 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* dl_git: use the multicall git binary; the hardlinks aren't available
+	  by default anymore since 1.6 #14648
+
+2008-08-20 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* gaze: made gaze search not display duplicates
+
+2008-08-18 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* confmeld: make sure the config stage dir exists
+
 2008-07-18 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* sorcery: properly check for empty files in *_execute()
 
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 5beff0d..18ac5b0 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.1-rc5
+1.14.1-rc6
diff --git a/usr/sbin/confmeld b/usr/sbin/confmeld
index 2364696..a6fd65d 100755
--- a/usr/sbin/confmeld
+++ b/usr/sbin/confmeld
@@ -298,6 +298,8 @@ function main()
   local last_spell=""
   local last_sdate=""
 
+  [[ -d $CONFIG_STAGE_DIRECTORY ]] || mkdir -p $CONFIG_STAGE_DIRECTORY
+
   process_parameters "$@"
 
   confmeld_all
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 6a064e7..2bd9c51 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -653,7 +653,7 @@ function gaze_search() {
     -short) shift; real_short_search "$@"  ;;
          *)        real_long_search  "$@"  ;;
 
-    esac
+    esac | awkuniq
 }
 
 #-----------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_git b/var/lib/sorcery/modules/dl_handlers/dl_git
index 9d73a48..3a8978d 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_git
+++ b/var/lib/sorcery/modules/dl_handlers/dl_git
@@ -43,19 +43,19 @@ 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 )
+      echo git checkout $GIT_TAG &&
+      git checkout $GIT_TAG &&
+      echo git pull $GIT_ROOT $GIT_TAG
+      git pull $GIT_ROOT $GIT_TAG )
       rc=$?
       eval "$dl_target=\"$GIT_DIRECTORY\""
     else
       message "${MESSAGE_COLOR}Running git clone...${DEFAULT_COLOR}"
-      echo git-clone $GIT_ROOT $GIT_DIRECTORY
-      git-clone $GIT_ROOT $GIT_DIRECTORY &&
+      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 &&
+      echo git checkout $GIT_TAG
+      git checkout $GIT_TAG &&
       cd ../
       rc=$?
       eval "$dl_target=\"$GIT_DIRECTORY\""



More information about the SM-Commit mailing list