From e87888638ef230772e2dc2e007a3bc5653edc476 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 22 Jun 2007 09:14:05 +0000 Subject: [PATCH] Move "-prefix" into main version, instead of repoman alone. svn path=/main/branches/prefix/; revision=6949 --- bin/repoman | 2 +- tarball.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/repoman b/bin/repoman index 751a4ffde..c5bd8adef 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1819,7 +1819,7 @@ elif "--pretend" not in myoptions: exithandler() try: unameout=getstatusoutput("uname -srp")[1] - commitmessage+="\n(Portage "+str(portage.VERSION)+"-prefix/" + commitmessage+="\n(Portage "+str(portage.VERSION)+"/" if isCvs: commitmessage+="CVS" elif isSvn: diff --git a/tarball.sh b/tarball.sh index 3479ec53d..c2bb13137 100755 --- a/tarball.sh +++ b/tarball.sh @@ -24,7 +24,7 @@ fi install -d -m0755 ${DEST} cp -pPR . ${DEST} -sed -i -e '/^VERSION=/s/^.*$/VERSION="'${V}'"/' ${DEST}/pym/portage/__init__.py +sed -i -e '/^VERSION=/s/^.*$/VERSION="'${V}-prefix'"/' ${DEST}/pym/portage/__init__.py sed -i -e "s/##VERSION##/${V}/g" ${DEST}/man/emerge.1 #rm ${DEST}/man/*.eclass.5 -- 2.26.2