summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Redaelli <drizzt@gentoo.org>2009-02-06 16:24:23 +0000
committerTimothy Redaelli <drizzt@gentoo.org>2009-02-06 16:24:23 +0000
commit09b590067a7f6c0851fbeb78c9ad54584d64a248 (patch)
tree8f52812dafcb759aa2a580e9503491eff3c0c431
parentVersion bump (diff)
downloaddrizzt-09b590067a7f6c0851fbeb78c9ad54584d64a248.tar.gz
drizzt-09b590067a7f6c0851fbeb78c9ad54584d64a248.tar.bz2
drizzt-09b590067a7f6c0851fbeb78c9ad54584d64a248.zip
Fix ecommit
(Portage version: 2.2_rc23/svn/Linux x86_64) svn path=/; revision=151
-rw-r--r--app-portage/drizzt-scripts/ChangeLog6
-rw-r--r--app-portage/drizzt-scripts/drizzt-scripts-1.0-r2.ebuild2
-rw-r--r--app-portage/drizzt-scripts/files/ecommit7
-rw-r--r--app-portage/drizzt-scripts/metadata.xml4
4 files changed, 15 insertions, 4 deletions
diff --git a/app-portage/drizzt-scripts/ChangeLog b/app-portage/drizzt-scripts/ChangeLog
index 4bd2a91..074595f 100644
--- a/app-portage/drizzt-scripts/ChangeLog
+++ b/app-portage/drizzt-scripts/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for app-portage/drizzt-scripts
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 Feb 2009; Timothy Redaelli <drizzt@gentoo.org> files/ecommit,
+ +metadata.xml:
+ Fix ecommit
+
14 May 2007; Timothy Redaelli <drizzt@gentoo.org> files/ecommit:
Allow svn repoman.
diff --git a/app-portage/drizzt-scripts/drizzt-scripts-1.0-r2.ebuild b/app-portage/drizzt-scripts/drizzt-scripts-1.0-r2.ebuild
index 64822b5..9aaa745 100644
--- a/app-portage/drizzt-scripts/drizzt-scripts-1.0-r2.ebuild
+++ b/app-portage/drizzt-scripts/drizzt-scripts-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
diff --git a/app-portage/drizzt-scripts/files/ecommit b/app-portage/drizzt-scripts/files/ecommit
index 622a80d..a6bbcb5 100644
--- a/app-portage/drizzt-scripts/files/ecommit
+++ b/app-portage/drizzt-scripts/files/ecommit
@@ -2,7 +2,7 @@
# Public domained by Timothy Redaelli
-source /sbin/functions.sh
+source /usr/lib/portage/bin/isolated-functions.sh
set -e
@@ -18,6 +18,8 @@ if [[ -e "$(type -P keychain)" ]] && hasq sign ${FEATURES}; then
source "${HOME}/.keychain/${HOSTNAME}-sh-gpg"
fi
+repoman full
+
"${EDITOR}" "$commitmsg"
ECHANGELOG_EDITOR= echangelog < "$commitmsg"
@@ -35,11 +37,12 @@ if ( ! fgrep -q '.svn' "$(type -P repoman)" ) && [[ -d .svn ]]; then
eend $?
fi
eend $?
- svn add Manifest &>/dev/null
+ svn add Manifest &>/dev/null
ebegin "Committing"
svn commit -F "$commitmsg" || svn commit .. -F "$commitmsg"
eend $?
elif ls *.ebuild >/dev/null 2>&1; then
+ svn commit -F "$commitmsg" --depth=empty .. || true
repoman -M "$commitmsg" commit
elif [[ -d CVS ]]; then
cvs commit -F "$commitmsg"
diff --git a/app-portage/drizzt-scripts/metadata.xml b/app-portage/drizzt-scripts/metadata.xml
new file mode 100644
index 0000000..097975e
--- /dev/null
+++ b/app-portage/drizzt-scripts/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>