Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 110978 Details for
Bug 167667
Portage trigger to stop Manifest1 generation
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
repoman support for removal of manifest1 from cvs
repoman.patch (text/plain), 2.83 KB, created by
Zac Medico
on 2007-02-22 13:56:27 UTC
(
hide
)
Description:
repoman support for removal of manifest1 from cvs
Filename:
MIME Type:
Creator:
Zac Medico
Created:
2007-02-22 13:56:27 UTC
Size:
2.83 KB
patch
obsolete
>Index: bin/repoman >=================================================================== >--- bin/repoman (revision 6037) >+++ bin/repoman (working copy) >@@ -560,9 +560,13 @@ > if not kwlist: > err("Couldn't read KEYWORDS from arch.list") > >+manifest1_compat = not os.path.exists( >+ os.path.join(portdir, "manifest1_obsolete")) > if portdir_overlay != portdir: > kwlist.update(portage.grabfile( > os.path.join(portdir_overlay, "profiles", "arch.list"))) >+ manifest1_compat = not os.path.exists( >+ os.path.join(portdir_overlay, "manifest1_obsolete")) > > scanlist=[] > if repolevel==2: >@@ -823,8 +827,10 @@ > > if os.path.exists(checkdir+"/files"): > filesdirlist=os.listdir(checkdir+"/files") >- for y in filesdirlist: >- if y[:7]=="digest-": >+ if manifest1_compat: >+ for y in filesdirlist: >+ if not y.startswith("digest-"): >+ continue > if y[7:] not in dadded: > #digest not added to cvs > stats["digest.notadded"]=stats["digest.notadded"]+1 >@@ -953,7 +959,8 @@ > if y in dadded: > stats["ebuild.disjointed"]=stats["ebuild.disjointed"]+1 > fails["ebuild.disjointed"].append(x+"/"+y+".ebuild") >- if not os.path.exists(checkdir+"/files/digest-"+y): >+ if manifest1_compat and \ >+ not os.path.exists(os.path.join(checkdir, "files", "digest-"+y)): > if mymode=="fix": > if "--pretend" in myoptions: > print "You will need to run:" >@@ -1594,6 +1601,47 @@ > except AttributeError: > print "Failed to insert portage version in message!" > commitmessage+="\n(Portage version: Unknown)" >+ >+ 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 > fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 167667
:
110767
|
110808
| 110978