Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 10309E00A97; Wed, 29 Jul 2015 13:51:00 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [134.134.136.20 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 44709E009B3 for ; Wed, 29 Jul 2015 13:50:58 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 29 Jul 2015 13:50:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,572,1432623600"; d="scan'208";a="757672252" Received: from alimon-thinkpad-w540.zpn.intel.com ([10.219.5.54]) by fmsmga001.fm.intel.com with ESMTP; 29 Jul 2015 13:50:57 -0700 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= To: yocto@yoctoproject.org Date: Wed, 29 Jul 2015 15:50:48 -0500 Message-Id: <1438203053-7909-6-git-send-email-anibal.limon@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438203053-7909-1-git-send-email-anibal.limon@linux.intel.com> References: <1438203053-7909-1-git-send-email-anibal.limon@linux.intel.com> MIME-Version: 1.0 Cc: paul.eggleton@linux.intel.com Subject: [PATCH 05/10][auh] upgradehelper.py: Add own step for loading environment X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jul 2015 20:51:00 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of load environment in detecting git repository use own function making easy to debug. Signed-off-by: Aníbal Limón --- upgradehelper.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/upgradehelper.py b/upgradehelper.py index 13fc7dd..9119cb0 100755 --- a/upgradehelper.py +++ b/upgradehelper.py @@ -147,6 +147,7 @@ class Updater(object): self.upgrade_steps = [ (self._create_workdir, None), + (self._get_env, "Loading environment ..."), (self._detect_repo, "Detecting git repository location ..."), (self._clean_repo, "Cleaning git repository of temporary branch ..."), (self._detect_recipe_type, None), @@ -205,18 +206,16 @@ class Updater(object): os.remove(os.path.join(self.workdir, f)) def _detect_repo(self): - self._get_env() - - if self.env['PV'] == self.new_ver: + if self.env['PKGV'] == self.new_ver: raise UpgradeNotNeededError - if self.git is not None: + # UniverseUpdater use git poky respository + if isinstance(self.git, UniverseUpdater): return self.git = Git(self.recipe_dir) stdout = self.git.status() - if stdout != "": if self.interactive: W(" %s: git repository has uncommited work which will be dropped! Proceed? (y/N)" % self.pn) @@ -527,6 +526,8 @@ class Updater(object): class UniverseUpdater(Updater): def __init__(self): Updater.__init__(self, True, True) + + # XXX: assume that the poky directory is the first entry in the PATH self.git = Git(os.path.dirname(os.getenv('PATH', False).split(':')[0])) # read history file -- 1.9.1