[icinga-checkins] icinga.org: icinga-core/refs/tags/v1.6.2: backport fix for broken make-tarball

git at icinga.org git at icinga.org
Sun Jan 13 22:41:56 CET 2013


Module: icinga-core
Branch: refs/tags/v1.6.2
Commit: 3b87055501d26f3cbea3ad65dd288db33837b949
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=3b87055501d26f3cbea3ad65dd288db33837b949

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Sun Jan 13 22:40:04 2013 +0100

backport fix for broken make-tarball

---

 make-tarball |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/make-tarball b/make-tarball
index b33e554..e30ed50 100755
--- a/make-tarball
+++ b/make-tarball
@@ -106,11 +106,6 @@ while test $# -gt 0; do
             version
             exit
             ;;
-	--tag )
-            shift
-	    TREEISH="$1"
-            shift
-            ;;
 
         -? | --usage | --help )
             usage
@@ -149,8 +144,8 @@ git archive --format=$FORMAT --prefix="$PREFIX" $TREEISH > $TMPDIR/$(basename $(
 echo $TMPDIR/$(basename $(pwd)).$FORMAT >| $TMPFILE # clobber on purpose
 superfile=`head -n 1 $TMPFILE`
 
-# find all '.git' dirs, these show us the remaining to-be-archived dirs
-find . -name '.git' -type d -print | sed -e 's/^\.\///' -e 's/\.git$//' | grep -v '^$' >> $TOARCHIVE
+# DEACTIVATED: We do not have any exportable sub repositories
+# find . -name '.git' -type d -print | sed -e 's/^\.\///' -e 's/\.git$//' | grep -v '^$' >> $TOARCHIVE
 
 while read path; do
     TREEISH=$(git submodule | grep "^ .*${path%/}" | cut -d ' ' -f 2) # git-submodule does not list trailing slashes in $path





More information about the icinga-checkins mailing list