manually merge differences with the trunk

svn path=/main/branches/prefix/; revision=10306

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 2175df6b94a619bafc7473462f4a59cfe15f6978..e805fbe1b91b8d10593b205c9162b82e81fc6b38 100644 (file)
--- 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 e78631a23f66219dbf1ba74225d1d45255603f8c..6172035eb9e52346a66bc1c3af7229caeaf5f6d2 100644 (file)
--- 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