From: Zac Medico Date: Mon, 8 May 2006 07:48:21 +0000 (-0000) Subject: Prevent a TypeError exception when the /etc/make.profile symlink is broken on nonexis... X-Git-Tag: v2.1_rc1~11 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f38ee361f2141a32892f600cb359292fd5ea007;p=portage.git Prevent a TypeError exception when the /etc/make.profile symlink is broken on nonexistent. svn path=/main/trunk/; revision=3332 --- diff --git a/pym/portage.py b/pym/portage.py index 1b70f5e59..96fb8bb36 100644 --- 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