Move "-prefix" into main version, instead of repoman alone.

svn path=/main/branches/prefix/; revision=6949

diff --git a/bin/repoman b/bin/repoman
index 751a4ffdefa6f236ca942c78b0a682bf4e54243c..c5bd8adefad9c294018b1b31fdf0a6628b6d97d8 100755 (executable)
--- 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 3479ec53df75995f66dd8695f5f234f7cb48a818..c2bb13137b4b6fc9c814a7acf80a48ea15ab0e1f 100755 (executable)
--- 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