diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2010-11-04 18:15:27 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2010-11-04 18:15:27 +0000 |
| commit | 29744783f2c819cae787e83fb5316db2153d33d6 (patch) | |
| tree | d764fafb6609b9da8c25640236df558bbf7de299 /dev-vcs/gitolite-gentoo/files | |
| parent | Version bump (diff) | |
| download | historical-29744783f2c819cae787e83fb5316db2153d33d6.tar.gz historical-29744783f2c819cae787e83fb5316db2153d33d6.tar.bz2 historical-29744783f2c819cae787e83fb5316db2153d33d6.zip | |
Revision bump. HOMEPAGE and DESCRIPTION fixed. Added a patch to fix tempfile creation in gl-setup.
Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64
Diffstat (limited to 'dev-vcs/gitolite-gentoo/files')
| -rw-r--r-- | dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch b/dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch new file mode 100644 index 000000000000..d8ade1288356 --- /dev/null +++ b/dev-vcs/gitolite-gentoo/files/gl-setup-tempfile.patch @@ -0,0 +1,41 @@ +diff --git a/src/gl-setup b/src/gl-setup +index e72ebc6..f9f50a2 100755 +--- a/src/gl-setup ++++ b/src/gl-setup +@@ -21,6 +21,9 @@ GL_PACKAGE_CONF=/tmp/share/gitolite/conf + + die() { echo "$@"; exit 1; } + ++TEMPDIR=$(mktemp -d) ++export TEMPDIR ++trap "/bin/rm -rf $TEMPDIR" 0 + + if [ -n "$GITOLITE_HTTP_HOME" ] + then +@@ -40,10 +43,10 @@ fi + + if [ -f $HOME/.gitolite.rc ] + then +- perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $GL_PACKAGE_CONF/example.gitolite.rc | sort > .newvars +- perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $HOME/.gitolite.rc | sort > .oldvars +- comm -23 .newvars .oldvars > .diffvars +- if [ -s .diffvars ] ++ perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $GL_PACKAGE_CONF/example.gitolite.rc | sort > $TEMPDIR/.newvars ++ perl -ne 's/^\s+//; s/[\s=].*//; print if /^\$/;' < $HOME/.gitolite.rc | sort > $TEMPDIR/.oldvars ++ comm -23 $TEMPDIR/.newvars $TEMPDIR/.oldvars > $TEMPDIR/.diffvars ++ if [ -s $TEMPDIR/.diffvars ] + then + cp $GL_PACKAGE_CONF/example.gitolite.rc $HOME/.gitolite.rc.new + echo new version of the rc file saved in $HOME/.gitolite.rc.new +@@ -51,10 +54,9 @@ then + echo please update $HOME/.gitolite.rc manually if you need features + echo controlled by any of the following variables: + echo ---- +- sed -e 's/^/ /' < .diffvars ++ sed -e 's/^/ /' < $TEMPDIR/.diffvars + echo ---- + fi +- rm -f .newvars .oldvars .diffvars + else + [ -n "$GITOLITE_HTTP_HOME" ] || [ -n "$pubkey_file" ] || die "looks like first run -- I need a pubkey file" + [ -z "$GITOLITE_HTTP_HOME" ] || [ -n "$admin_name" ] || die "looks like first run -- I need an admin name" |