Prevent a TypeError exception when the /etc/make.profile symlink is broken on nonexis...

svn path=/main/trunk/; revision=3332

diff --git a/pym/portage.py b/pym/portage.py
index 1b70f5e59a618b62c3931e6d896b2eb2cddaccd3..96fb8bb36dcc80b732ec4605b0bf9d2699abc7f8 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1014,18 +1014,16 @@ class config:
                        # configlist will contain: [ globals, defaults, conf, pkg, auto, backupenv (incrementals), origenv ]
 
                        # The symlink might not exist or might not be a symlink.
-                       try:
-                               self.profiles=[abssymlink(self.profile_path)]
-                       except SystemExit, e:
-                               raise
-                       except:
-                               self.profiles=[self.profile_path]
-
-                       mypath = self.profiles[0]
-                       while os.path.exists(mypath+"/parent"):
-                               mypath = os.path.normpath(mypath+"///"+grabfile(mypath+"/parent")[0])
-                               if os.path.exists(mypath):
-                                       self.profiles.insert(0,mypath)
+                       if self.profile_path is None:
+                               self.profiles = []
+                       else:
+                               self.profiles = [abssymlink(self.profile_path)]
+                               mypath = self.profiles[0]
+                               while os.path.exists(os.path.join(mypath, "parent")):
+                                       mypath = os.path.normpath(os.path.join(
+                                               mypath, grabfile(os.path.join(mypath, "parent"))[0]))
+                                       if os.path.exists(mypath):
+                                               self.profiles.insert(0, mypath)
 
                        if os.environ.has_key("PORTAGE_CALLER") and os.environ["PORTAGE_CALLER"] == "repoman":
                                pass