From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id DE775E00A86; Wed, 29 Jul 2015 13:50:57 -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 90684E009B3 for ; Wed, 29 Jul 2015 13:50:56 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 29 Jul 2015 13:50:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,572,1432623600"; d="scan'208";a="757672226" Received: from alimon-thinkpad-w540.zpn.intel.com ([10.219.5.54]) by fmsmga001.fm.intel.com with ESMTP; 29 Jul 2015 13:50:55 -0700 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= To: yocto@yoctoproject.org Date: Wed, 29 Jul 2015 15:50:45 -0500 Message-Id: <1438203053-7909-3-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 02/10][auh] upgradehelper.py: Validate if upgrade is needed 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:50:57 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When run upgradehelper only with one recipe upgrade needed validation isn't did. [YOCTO #7947] Signed-off-by: Aníbal Limón --- upgradehelper.py | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/upgradehelper.py b/upgradehelper.py index 63b30e4..f10d974 100755 --- a/upgradehelper.py +++ b/upgradehelper.py @@ -207,6 +207,9 @@ class Updater(object): def _detect_repo(self): self._get_env() + if self.env['PV'] == self.new_ver: + raise UpgradeNotNeededError + if self.git is not None: return @@ -496,9 +499,24 @@ class Updater(object): step() I(" %s: Upgrade SUCCESSFUL! Please test!" % self.pn) - except Error as e: - E(" %s: %s" % (self.pn, e.message)) - E(" %s: Upgrade FAILED! Logs and/or file diffs are available in %s" % (self.pn, self.workdir)) + except Exception as e: + if isinstance(e, UpgradeNotNeededError): + I(" %s: %s" % (self.pn, e.message)) + elif isinstance(e, UnsupportedProtocolError): + I(" %s: %s" % (self.pn, e.message)) + else: + if not isinstance(e, Error): + import traceback + msg = "Failed(unknown error)\n" + traceback.format_exc() + e = Error(message=msg) + error = e + + E(" %s: %s" % (self.pn, e.message)) + + if os.listdir(self.workdir): + E(" %s: Upgrade FAILED! Logs and/or file diffs are available in %s" + % (self.pn, self.workdir)) + error = e self._commit_changes() -- 1.9.1