Changeset 3453 for trunk

Timestamp:

Jun 16, 2007, 4:52:06 PM (18 years ago)

Author:

bird

Message:

Fixed a problem with the tress/ hack. Looks like the I created a reference or something of that kidney...

File:

• trunk/essentials/sys-apps/portage/pym/portage.py (modified) (3 diffs)

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

@@ -8250 +8250 @@
                 # clean up any existing portdbapi instances
                 for myroot in trees:
+                        # bird: see "/" hack below for details. (todo: learn python, this is ugly)
+                        try:
+                                trees[myroot]["this-is-a-reference-or-something"]
+                                continue
+                        except KeyError:
+                                myroot
                         portdb = trees[myroot]["porttree"].dbapi
                         portdb.close_caches()
                         portdbapi.portdbapi_instances.remove(portdb)
                         del trees[myroot]["porttree"], myroot, portdb
+                trees = {}      # bird: make sure it's empty or the hack below won't work.
 
         settings = config(config_root=config_root, target_root=target_root,
@@ -8279 +8286 @@
                         binarytree, myroot, mysettings["PKGDIR"], settings=mysettings)
 
-        # A hack to work around the assumptions that there is always a "/" entry.
-        # (bin/emerge uses "/" ...)
+        # bird: A hack to work around the assumptions that there is always a 
+        #       "/" entry. (bin/emerge uses "/" ...)
         if sys.platform == "os2knix" and settings["ROOT"] != "/":
                 try:
@@ -8286 +8293 @@
                 except KeyError:
                         trees["/"] = trees[settings["ROOT"]]
+                        trees["/"]["this-is-a-reference-or-something"] = 1
 
         return trees