summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-02-01 03:14:41 +0000
committerZac Medico <zmedico@gentoo.org>2008-02-01 03:14:41 +0000
commit1ed0c20fee3fba3f4b54891ef888a863a94b0f1a (patch)
tree871163532f181267b288a9bb62e0a07dc487d48c
parent428d46be750420fd00af619155b4de3ea722c8b6 (diff)
downloadportage-1ed0c20fee3fba3f4b54891ef888a863a94b0f1a.tar.gz
portage-1ed0c20fee3fba3f4b54891ef888a863a94b0f1a.tar.bz2
portage-1ed0c20fee3fba3f4b54891ef888a863a94b0f1a.zip
Remove the manifest1 digest file removal code since it's no longer
needed. (trunk r9262) svn path=/main/branches/2.1.2/; revision=9263
-rwxr-xr-xbin/repoman39
1 files changed, 0 insertions, 39 deletions
diff --git a/bin/repoman b/bin/repoman
index a83ba6bec..7b95304d0 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2102,45 +2102,6 @@ else:
if "--force" in myoptions:
commitmessage += ", RepoMan options: --force"
commitmessage += ")"
- if not manifest1_compat:
- myfiles = myupdates + myremoved + mymanifests
- filesdirs = set()
- if repolevel == 3:
- filesdirs.add(os.path.join(".", "files"))
- elif repolevel in (1, 2):
- for x in myfiles:
- xs = x.split(os.path.sep)
- if len(xs) < 4-repolevel:
- continue
- xs = xs[0:4-repolevel]
- xs.append("files")
- filesdirs.add(os.path.join(*xs))
- else:
- raise AssertionError("repolevel=%s" % str(repolevel))
- digest_files = []
- for x in filesdirs:
- dir_path = os.path.join(startdir, x)
- if not os.path.isdir(dir_path):
- continue
- for y in os.listdir(dir_path):
- if y.startswith("digest-"):
- digest_files.append(os.path.join(x, y))
- if digest_files:
- digest_files.sort()
- if "--pretend" in myoptions:
- print "(rm %s)" % " ".join(digest_files)
- print "(/usr/bin/cvs remove %s)" % " ".join(digest_files)
- else:
- for x in digest_files:
- os.unlink(os.path.join(startdir, x))
- retval = spawn(["/usr/bin/cvs", "remove"] + digest_files,
- env=os.environ)
- if retval != os.EX_OK:
- print "!!! Exiting on cvs (shell) error code:",retval
- sys.exit(retval)
- myremoved.extend(digest_files)
- myremoved = list(set(myremoved))
- myremoved.sort()
if myupdates or myremoved:
myfiles = myupdates + myremoved