From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dan.rpsys.net (dan.rpsys.net [93.97.175.187]) by mail.openembedded.org (Postfix) with ESMTP id 54F0960DED for ; Thu, 19 Dec 2013 09:40:24 +0000 (UTC) Received: from localhost (dan.rpsys.net [127.0.0.1]) by dan.rpsys.net (8.14.4/8.14.4/Debian-2.1ubuntu1) with ESMTP id rBJ9eJux006180 for ; Thu, 19 Dec 2013 09:40:19 GMT X-Virus-Scanned: Debian amavisd-new at dan.rpsys.net Received: from dan.rpsys.net ([127.0.0.1]) by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id yRReHmIWSulD for ; Thu, 19 Dec 2013 09:40:19 +0000 (GMT) Received: from [192.168.3.10] (rpvlan0 [192.168.3.10]) (authenticated bits=0) by dan.rpsys.net (8.14.4/8.14.4/Debian-2.1ubuntu1) with ESMTP id rBJ9eFbj006177 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Thu, 19 Dec 2013 09:40:16 GMT Message-ID: <1387446010.6402.65.camel@ted> From: Richard Purdie To: openembedded-core Date: Thu, 19 Dec 2013 09:40:10 +0000 X-Mailer: Evolution 3.8.4-0ubuntu1 Mime-Version: 1.0 Subject: [PATCH] sstatesig: Correctly handle matches spanning stamps and sstatedir 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: Thu, 19 Dec 2013 09:40:24 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit By resetting filesdates at this point, we lose matches from stamps which may not have been in sstatedir. When we don't have hashes specicifed, its better to return all matches and have the caller decide which are relavent and which are not since this function has no ability to decide. There will almost always be one match from stamps we need to keep and refer to. Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 835cee8..5354c75 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -154,7 +154,6 @@ def find_siginfo(pn, taskname, taskhashlist, d, hashfn = None): else: sstatedir = d.getVar('SSTATE_DIR', True) - filedates = {} for root, dirs, files in os.walk(sstatedir): for fn in files: fullpath = os.path.join(root, fn)