From 2579aa8efc16bf5dc66004d36840185332351c8f Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 12 May 2008 19:21:33 +0000 Subject: [PATCH] manually merge differences with the trunk svn path=/main/branches/prefix/; revision=10306 --- pym/_emerge/__init__.py | 4 +++- pym/portage/__init__.py | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 2175df6b9..e805fbe1b 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2589,7 +2589,8 @@ class depgraph(object): self._sets[s] = expanded_set args.append(SetArg(arg=x, set=expanded_set, root_config=root_config)) - myfavorites.append(x) + if sets[s].world_candidate: + myfavorites.append(x) continue if not is_valid_package_atom(x): portage.writemsg("\n\n!!! '%s' is not a valid package atom.\n" % x, @@ -7543,6 +7544,7 @@ def action_info(settings, trees, myopts, myfiles): print header_title.rjust(int(header_width/2 + len(header_title)/2)) print header_width * "=" print "System uname: "+unameout + lastSync = portage.grabfile(os.path.join( settings["PORTDIR"], "metadata", "timestamp.chk")) print "Timestamp of tree:", diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e78631a23..6172035eb 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -68,10 +68,6 @@ if os.uname()[0] in ["FreeBSD"]: return _chflags(path, flags, opts="-h") bsd_chflags.chflags = _chflags bsd_chflags.lchflags = _lchflags - if not hasattr(os.lstat("/"), "st_flags"): - sys.stderr.write("WARNING: BSD chflags are disabled since the st_flags attribute is missing!\n") - sys.stderr.flush() - bsd_chflags = None try: from portage.cache.cache_errors import CacheError -- 2.26.2