Changeset 3501

Timestamp:

Jun 19, 2007, 2:44:17 AM (18 years ago)

Author:

bird

Message:

config_root + EPREFIX; target_root + EPREFIX; and someothers must be normalized to prevent them from ending up with stuff like '@unixroot' that would be interpreted as the start of an UNC path on OS/2. We enlist nromalize_path in this scheme.

Location:

trunk/essentials/sys-apps/prefix-portage/pym/portage

Files:

• __init__.py (modified) (15 diffs)
• util.py (modified) (1 diff)

trunk/essentials/sys-apps/prefix-portage/pym/portage/__init__.py

@@ -472 +472 @@
         if env is None:
                 env = os.environ
-        envd_dir = os.path.join(target_root + EPREFIX, "etc", "env.d")
+        envd_dir = os.path.join(normalize_path(target_root + EPREFIX), "etc", "env.d")
         portage.util.ensure_dirs(envd_dir, mode=0755)
         fns = listdir(envd_dir, EmptyOnError=1)
@@ -547 +547 @@
                 env.update(myconfig)
 
-        ldsoconf_path = os.path.join(target_root + EPREFIX, "etc", "ld.so.conf")
+        ldsoconf_path = os.path.join(normalize_path(target_root + EPREFIX), "etc", "ld.so.conf")
         try:
                 myld = open(ldsoconf_path)
@@ -579 +579 @@
         if prelink_capable:
                 newprelink = atomic_ofstream(
-                        os.path.join(target_root + EPREFIX, "etc", "prelink.conf"))
+                        os.path.join(normalize_path(target_root + EPREFIX), "etc", "prelink.conf"))
                 newprelink.write("# prelink.conf autogenerated by env-update; make all changes to\n")
                 newprelink.write("# contents of "+EPREFIX+"/etc/env.d directory\n")
@@ -614 +614 @@
         lib_dirs = set()
         for lib_dir in portage.util.unique_array(specials["LDPATH"]+['usr/lib','usr/lib64','usr/lib32','lib','lib64','lib32']):
-                x = os.path.join(target_root + EPREFIX, lib_dir.lstrip(os.sep))
+                x = os.path.join(normalize_path(target_root + EPREFIX), lib_dir.lstrip(os.sep))
                 try:
                         newldpathtime = long(os.stat(x).st_mtime)
@@ -670 +670 @@
                         # to overwrite the symlinks we just made. -X means no links. After 'clean'
                         # we can safely create links.
-                        writemsg(">>> Regenerating %s/etc/ld.so.cache...\n" % (target_root+EPREFIX))
+                        writemsg(">>> Regenerating %s/etc/ld.so.cache...\n" % (normalize_path(target_root+EPREFIX)))
                         if makelinks:
                                 os.system("cd / ; %s -r '%s'" % (ldconfig, target_root))
@@ -677 +677 @@
                 elif ostype in ("FreeBSD","DragonFly"):
                         writemsg(">>> Regenerating %svar/run/ld-elf.so.hints...\n" % \
-                                target_root+EPREFIX)
+                                normalize_path(target_root+EPREFIX))
                         os.system(("cd / ; %s -elf -i " + \
                                 "-f '%svar/run/ld-elf.so.hints' '%setc/ld.so.conf'") % \
-                                (ldconfig, target_root+EPREFIX, target_root+EPREFIX))
+                                (ldconfig, normalize_path(target_root+EPREFIX), normalize_path(target_root+EPREFIX)))
 
         del specials["LDPATH"]
@@ -691 +691 @@
 
         #create /etc/profile.env for bash support
-        outfile = atomic_ofstream(os.path.join(target_root + EPREFIX, "etc", "profile.env"))
+        outfile = atomic_ofstream(os.path.join(normalize_path(target_root + EPREFIX), "etc", "profile.env"))
         outfile.write(penvnotice)
 
@@ -701 +701 @@
 
         #create /etc/csh.env for (t)csh support
-        outfile = atomic_ofstream(os.path.join(target_root + EPREFIX, "etc", "csh.env"))
+        outfile = atomic_ofstream(os.path.join(normalize_path(target_root + EPREFIX), "etc", "csh.env"))
         outfile.write(cenvnotice)
         for x in env_keys:
@@ -944 +944 @@
                                 config_root)).rstrip(os.path.sep) + os.path.sep
 
-                        check_var_directory("PORTAGE_CONFIGROOT", config_root + EPREFIX)
+                        check_var_directory("PORTAGE_CONFIGROOT", normalize_path(config_root + EPREFIX))
 
                         self.depcachedir = DEPCACHE_PATH
@@ -1080 +1080 @@
 
                         try:
-                                self.mygcfg   = getconfig(os.path.join(config_root + EPREFIX, "etc", "make.globals"))
+                                self.mygcfg   = getconfig(os.path.join(normalize_path(config_root + EPREFIX), "etc", "make.globals"))
 
                                 if self.mygcfg is None:
@@ -1190 +1190 @@
                                 target_root)).rstrip(os.path.sep) + os.path.sep
 
-                        check_var_directory("ROOT", target_root + EPREFIX)
+                        check_var_directory("ROOT", normalize_path(target_root + EPREFIX))
 
                         env_d = getconfig(
-                                os.path.join(target_root + EPREFIX, "etc", "profile.env"), expand=False)
+                                os.path.join(normalize_path(target_root + EPREFIX), "etc", "profile.env"), expand=False)
                         # env_d will be None if profile.env doesn't exist.
                         if env_d:
@@ -1478 +1478 @@
                 Create a few directories that are critical to portage operation
                 """
-                if not os.access(self["ROOT"] + EPREFIX, os.W_OK):
+                if not os.access(normalize_path(self["ROOT"] + EPREFIX), os.W_OK):
                         return
 
@@ -1898 +1898 @@
                 self.configdict["env.d"].clear()
                 env_d = getconfig(
-                        os.path.join(self["ROOT"] + EPREFIX, "etc", "profile.env"), expand=False)
+                        os.path.join(normalize_path(self["ROOT"] + EPREFIX), "etc", "profile.env"), expand=False)
                 if env_d:
                         # env_d will be None if profile.env doesn't exist.
@@ -3289 +3289 @@
         #set up KV variable -- DEP SPEEDUP :: Don't waste time. Keep var persistent.
         if (mydo!="depend") or not mysettings.has_key("KV"):
-                mykv,err1=ExtractKernelVersion(os.path.join(myroot + EPREFIX, "usr/src/linux"))
+                mykv,err1=ExtractKernelVersion(os.path.join(normalize_path(myroot + EPREFIX), "usr/src/linux"))
                 if mykv:
                         # Regular source tree
@@ -4153 +4153 @@
 def merge(mycat, mypkg, pkgloc, infloc, myroot, mysettings, myebuild=None,
         mytree=None, mydbapi=None, vartree=None, prev_mtimes=None):
-        if not os.access(myroot+EPREFIX.lstrip("/"), os.W_OK):
+        if not os.access(normalize_path(myroot+EPREFIX).lstrip("/"), os.W_OK):
                 writemsg("Permission denied: access('%s', W_OK)\n" %
-                                (myroot+EPREFIX.lstrip("/")), noiselevel=-1)
+                                (normalize_path(myroot+EPREFIX).lstrip("/")), noiselevel=-1)
                 return errno.EACCES
         mylink = dblink(mycat, mypkg, myroot, mysettings, treetype=mytree,

trunk/essentials/sys-apps/prefix-portage/pym/portage/util.py

@@ -40 +40 @@
         This doesn't apply to OS/2 kNIX where "//foo/bar" differs
         from "/foo/bar" in that the former is a UNC path while the 
-        later is a local path.
+        later is a local path. However, on OS/2 we must fix the silly
+    //@unixroot -> /@unixroot that's caused by config_target+EPREFIX
+    all over the 'ing place.
         """
-        if mypath.startswith(os.path.sep) and sys.platform != "os2knix"::
+        if sys.platform == "os2knix":
+                if mypath[:11] == "//@unixroot":
+                         mypath = mypath[1:]
+                elif mypath[:12] == "///@unixroot":
+                         print "dbg: %s -> %s\n" % (mypath, mypath[2:])
+                         mypath = mypath[2:]
+                return os.path.normpath(mypath)
+        elif mypath.startswith(os.path.sep):
                 # posixpath.normpath collapses 3 or more leading slashes to just 1.
                 return os.path.normpath(2*os.path.sep + mypath)