From a60df2f0b898c41130ed0192a64626603dc19d42 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Fri, 11 Apr 2014 12:17:28 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20make.profile=20=D0=B2=20/etc/portage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update/update.py | 2 +- update/variables/update.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/update/update.py b/update/update.py index 5d8936c..cb8b0b5 100644 --- a/update/update.py +++ b/update/update.py @@ -467,7 +467,7 @@ class Update: emerge.uninstalling.add_observer(self._printUninstallPackage) try: emerge.run() - except EmergeError as e: + except EmergeError: self.emerge_cache.drop_cache() if emerge.emerging_error: self.printPre( diff --git a/update/variables/update.py b/update/variables/update.py index 0f79468..a000e45 100644 --- a/update/variables/update.py +++ b/update/variables/update.py @@ -117,8 +117,10 @@ class VariableClUpdateSystemProfile(ReadonlyVariable): """ def get(self): try: + make_profile = self.Get('cl_make_profile') return path.normpath( - path.join('/etc',os.readlink('/etc/make.profile'))) + path.join(path.dirname(make_profile), + os.readlink(make_profile))) except: raise VariableError(_("Failed to determine system profile"))