[patch] Patch to remove USERLAND autodetection.

portage-2.0.51.22-noautodetection.patch (text/plain), 1.26 KB, created by Diego Elio Pettenò (RETIRED) on 2005-05-30 17:57:21 UTC

diff -x '*~' -ur portage-2.0.51.22/pym/portage_data.py portage-2.0.51.22-nouserland/pym/portage_data.py
--- portage-2.0.51.22/pym/portage_data.py	2005-05-15 12:20:58.000000000 +0200
+++ portage-2.0.51.22-nouserland/pym/portage_data.py	2005-05-31 02:49:10.250863496 +0200
@@ -8,21 +8,16 @@
 from portage_util import writemsg
 from output import green,red
 
-ostype=os.uname()[0]
-
 lchown = None
-if ostype=="Linux" or ostype.lower().endswith("gnu"):
-	userland="GNU"
+if os.environ["USERLAND"] == "GNU":
 	os.environ["XARGS"]="xargs -r"
-elif ostype == "Darwin":
-	userland="Darwin"
-	os.environ["XARGS"]="xargs"	
-	lchown=os.chown
-elif ostype in ["FreeBSD","OpenBSD"]:
-	userland="BSD"
+elif os.environ["USERLAND"] == "BSD":
+	os.environ["XARGS"]="xargs"
+elif os.environ["USERLAND"] == "Darwin":
 	os.environ["XARGS"]="xargs"
-else:
-	writemsg(red("Operating system")+" \""+ostype+"\" "+red("currently unsupported. Exiting.")+"\n")
+	lchown=os.chown
+else
+	writemsg(red("Userland")+" \""+os.environ["USERLAND"]+"\" "+red("currently unsupported. Exiting.")+"\n")
 	sys.exit(1)
 
 if not lchown:
@@ -33,10 +28,6 @@
 		import missingos
 		lchown = missingos.lchown
 
-
-	
-os.environ["USERLAND"]=userland
-
 #Secpass will be set to 1 if the user is root or in the portage group.
 secpass=0