summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-31 01:01:59 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-31 01:01:59 +0000
commite159e90133c5a7cf908e2dde6fe1489fdd882220 (patch)
treecb3c2daa0b892f4909f26c383b208aa003c6bfdc
parent1e374b3bf8e33a19ca55c4fc9c64f0eb021ead33 (diff)
downloadportage-e159e90133c5a7cf908e2dde6fe1489fdd882220.tar.gz
portage-e159e90133c5a7cf908e2dde6fe1489fdd882220.tar.bz2
portage-e159e90133c5a7cf908e2dde6fe1489fdd882220.zip
Remove pointless cvs dependent REPOROOTS code. Thanks to Alec Warner <antarus@gentoo.org> for this patch.
svn path=/main/trunk/; revision=4049
-rwxr-xr-xbin/repoman25
1 files changed, 1 insertions, 24 deletions
diff --git a/bin/repoman b/bin/repoman
index 7793f6074..2ff21dce3 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -71,7 +71,6 @@ def exithandler(signum=None,frame=None):
os.kill(0,signal.SIGKILL)
signal.signal(signal.SIGINT,exithandler)
-REPOROOTS=["gentoo-x86"]
shortmodes={"ci":"commit"}
modeshelp={
"scan" : "Scan directory tree for QA issues (default)",
@@ -404,22 +403,7 @@ if os.path.isdir("CVS"):
print red("!!! ")+bold("Adding \"cvs\" to FEATURES")
print
os.environ["FEATURES"]=repoman_settings["FEATURES"]+" cvs"
-
- try:
- isCvs=True
- myrepofile=open("CVS/Repository")
- myreporoot=myrepofile.readline()[:-1]
- myrepofile.close()
- myrepofile=open("CVS/Root")
- myreporootpath=string.split(myrepofile.readline()[:-1], ":")[-1]
- myrepofile.close()
- if myreporootpath == myreporoot[:len(myreporootpath)]:
- # goofy os x cvs co.
- myreporoot = myreporoot[len(myreporootpath):]
- while myreporoot and myreporoot[0] == '/':
- myreporoot = myreporoot[1:]
- except (OSError, IOError):
- err("Error grabbing repository information; exiting.")
+ isCvs = True
if not "--pretend" in myoptions and not isCvs:
print
@@ -498,13 +482,6 @@ if not myreporoot:
myreporoot = os.path.basename(portdir_overlay)
myreporoot += mydir[len(portdir_overlay):-1]
-if isCvs:
- reporoot=None
- for x in REPOROOTS:
- if myreporoot[0:len(x)]==x:
- reporoot=myreporoot
- if not reporoot:
- err("Couldn't recognize repository type. Supported repositories:\n"+repr(REPOROOTS))
reposplit=string.split(myreporoot,"/")
repolevel=len(reposplit)