From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id CC50C75F1B for ; Wed, 15 Jul 2015 00:44:02 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 14 Jul 2015 17:44:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,476,1432623600"; d="scan'208";a="606330210" Received: from alimon-thinkpad-w540.zpn.intel.com ([10.219.5.54]) by orsmga003.jf.intel.com with ESMTP; 14 Jul 2015 17:44:00 -0700 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= To: openembedded-core@lists.openembedded.org Date: Tue, 14 Jul 2015 19:43:57 -0500 Message-Id: <1436921037-32378-4-git-send-email-anibal.limon@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436921037-32378-1-git-send-email-anibal.limon@linux.intel.com> References: <1436921037-32378-1-git-send-email-anibal.limon@linux.intel.com> MIME-Version: 1.0 Subject: [PATCHv2 3/3] recipeutils.py: get_recipe_pv_without_srcpv remove prefixes from pv X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jul 2015 00:44:03 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some recipes uses v or r prefixes in versions that makes wrong comparisions over recipes like lz4 r123 > 128. Signed-off-by: Aníbal Limón --- meta/lib/oe/recipeutils.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index f3da864..90dfba2 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -644,6 +644,12 @@ def get_recipe_pv_without_srcpv(pv, uri_type): pv = m.group('ver') pfx = m.group('pfx') sfx = m.group('sfx') + else: + regex = re.compile("(?P(v|r|))(?P((\d+[\.\-_]*)+))") + m = regex.match(pv) + if m: + pv = m.group('ver') + pfx = m.group('pfx') return (pv, pfx, sfx) -- 1.9.1