Remove the manifest1 digest file removal code since it's no longer

needed.

svn path=/main/trunk/; revision=9262

diff --git a/bin/repoman b/bin/repoman
index 6430edd7abb3f56623906a4939aa5891b37f97d4..921861612f84a66eeb240461001aa4669719d275 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1611,45 +1611,6 @@ else:
        if options.force:
                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 options.pretend:
-                               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