Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(391)

Side by Side Diff: pym/_emerge/main.py

Issue 6714030: Cleanup preserved lib locking in portage. (Closed)
Patch Set: Rebase Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « pym/_emerge/actions.py ('k') | pym/portage/dbapi/vartree.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 1999-2011 Gentoo Foundation 1 # Copyright 1999-2011 Gentoo Foundation
2 # Distributed under the terms of the GNU General Public License v2 2 # Distributed under the terms of the GNU General Public License v2
3 3
4 from __future__ import print_function 4 from __future__ import print_function
5 5
6 import logging 6 import logging
7 import signal 7 import signal
8 import stat 8 import stat
9 import sys 9 import sys
10 import textwrap 10 import textwrap
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 out.einfo("Processed %d info files." % ( icount,)) 210 out.einfo("Processed %d info files." % ( icount,))
211 211
212 def display_preserved_libs(vardbapi, myopts): 212 def display_preserved_libs(vardbapi, myopts):
213 MAX_DISPLAY = 3 213 MAX_DISPLAY = 3
214 214
215 if vardbapi._linkmap is None or \ 215 if vardbapi._linkmap is None or \
216 vardbapi._plib_registry is None: 216 vardbapi._plib_registry is None:
217 # preserve-libs is entirely disabled 217 # preserve-libs is entirely disabled
218 return 218 return
219 219
220 # Ensure the registry is consistent with existing files.
221 vardbapi._plib_registry.pruneNonExisting()
222
223 if vardbapi._plib_registry.hasEntries(): 220 if vardbapi._plib_registry.hasEntries():
224 if "--quiet" in myopts: 221 if "--quiet" in myopts:
225 print() 222 print()
226 print(colorize("WARN", "!!!") + " existing preserved lib s found") 223 print(colorize("WARN", "!!!") + " existing preserved lib s found")
227 return 224 return
228 else: 225 else:
229 print() 226 print()
230 print(colorize("WARN", "!!!") + " existing preserved lib s:") 227 print(colorize("WARN", "!!!") + " existing preserved lib s:")
231 228
232 plibdata = vardbapi._plib_registry.getPreservedLibs() 229 plibdata = vardbapi._plib_registry.getPreservedLibs()
(...skipping 1581 matching lines...) Expand 10 before | Expand all | Expand 10 after
1814 return 1 1811 return 1
1815 1812
1816 if "--pretend" not in myopts: 1813 if "--pretend" not in myopts:
1817 display_news_notification(root_config, myopts) 1814 display_news_notification(root_config, myopts)
1818 retval = action_build(settings, trees, mtimedb, 1815 retval = action_build(settings, trees, mtimedb,
1819 myopts, myaction, myfiles, spinner) 1816 myopts, myaction, myfiles, spinner)
1820 post_emerge(myaction, myopts, myfiles, settings["ROOT"], 1817 post_emerge(myaction, myopts, myfiles, settings["ROOT"],
1821 trees, mtimedb, retval) 1818 trees, mtimedb, retval)
1822 1819
1823 return retval 1820 return retval
OLDNEW
« no previous file with comments | « pym/_emerge/actions.py ('k') | pym/portage/dbapi/vartree.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698