In prefix we _always_ have GNU xargs, so we can *always* use -r (which

is short for --no-run-if-empty)

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

diff --git a/pym/portage/data.py b/pym/portage/data.py
index 21d156538d2933335a9f11d144719f3213e7779a..32ac724113539c7822108e5f76a9f12fae50604d 100644 (file)
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -16,24 +16,20 @@ bad = create_color_func("BAD")
 ostype=os.uname()[0]
 
 lchown = None
+os.environ["XARGS"]="xargs -r"
 if ostype=="Linux" or ostype.lower().endswith("gnu"):
        userland="GNU"
-       os.environ["XARGS"]="xargs -r"
 elif ostype == "Darwin":
        userland="Darwin"
-       os.environ["XARGS"]="xargs"
        def lchown(*pos_args, **key_args):
                pass
 elif ostype == "SunOS":
        userland="Solaris"
-       os.environ["XARGS"]="xargs"
 
 elif ostype.endswith("BSD") or ostype =="DragonFly":
        userland="BSD"
-       os.environ["XARGS"]="xargs"
 elif ostype in ["BeOS","Haiku","HP-UX"]:
        userland="GNU"
-       os.environ["XARGS"]="xargs"
 else:
        writemsg(red("Operating system")+" \""+ostype+"\" "+red("currently unsupported. Exiting.")+"\n")
        sys.exit(1)