From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ee0-f47.google.com ([74.125.83.47]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1S0Byn-0000Al-LZ for bitbake-devel@lists.openembedded.org; Wed, 22 Feb 2012 14:11:33 +0100 Received: by eekd41 with SMTP id d41so2677379eek.6 for ; Wed, 22 Feb 2012 05:03:13 -0800 (PST) Received-SPF: pass (google.com: domain of martin.jansa@gmail.com designates 10.14.95.141 as permitted sender) client-ip=10.14.95.141; Authentication-Results: mr.google.com; spf=pass (google.com: domain of martin.jansa@gmail.com designates 10.14.95.141 as permitted sender) smtp.mail=martin.jansa@gmail.com; dkim=pass header.i=martin.jansa@gmail.com Received: from mr.google.com ([10.14.95.141]) by 10.14.95.141 with SMTP id p13mr9715265eef.73.1329915793742 (num_hops = 1); Wed, 22 Feb 2012 05:03:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=FYinVgSK4UH12osvDbAjPerk7agwwA6+2crrxwAiD8s=; b=R8RyohSHdj7A1wonxZh0VfskIcBB0/HloFL6AJziAzkJBxvYnSq5E6vPeMQ+r2lHSl etvisQ0+jBIrBDagittOHbiFoBCfZ/r88VVz43RD23rBUDybCplDBdGtFxNCkYn7mayY hYCupmD31roM9OgJyP30ErLYdfxwQshHUD36M= Received: by 10.14.95.141 with SMTP id p13mr7712623eef.73.1329915793632; Wed, 22 Feb 2012 05:03:13 -0800 (PST) Received: from localhost ([94.230.152.246]) by mx.google.com with ESMTPS id a58sm102405461eeb.8.2012.02.22.05.03.12 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Feb 2012 05:03:12 -0800 (PST) From: Martin Jansa To: bitbake-devel@lists.openembedded.org Date: Wed, 22 Feb 2012 14:03:04 +0100 Message-Id: <1329915784-24760-1-git-send-email-Martin.Jansa@gmail.com> X-Mailer: git-send-email 1.7.8.4 Subject: [PATCH] siggen: compare runtaskdeps dictionary even when they have the same size X-BeenThere: bitbake-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Feb 2012 13:11:33 -0000 * otherwise it reports lots of changed checksums just because it compares different tasks notice linux-libc-headers_3.1.bb.do_package_write: Task dependency hash changed from 42acced29debf54d598802474c5e9cbb to f438a54f995df77620d0727d6f4b4ce5 (for linux-libc-headers_3.1.bb.do_package_write and linux-gta04_git.bb.do_deploy) Task dependency hash changed from 61f8babe1d10c6e7fb1423112bb04e1e to 1b3e21ff106ecfcb7ddf76a1e29537bb (for linux-nokia900-meego_git.bb.do_deploy and linux-gta04_git.bb.do_package_write) Task dependency hash changed from 512f9d6686d760b318d8b11c8b589226 to 42acced29debf54d598802474c5e9cbb (for linux-nokia900-meego_git.bb.do_package_write and linux-libc-headers_3.1.bb.do_package_write) Task dependency hash changed from 153e91dfd1d2053fda7b98cc08d4b802 to 92a293bdd8ed234932b87a66025038c5 (for systemd-serialgetty.bb.do_package_write and systemd-serialgetty.bb.do_package_write) Task dependency hash changed from 730abebf9954794bb440c2f3239f79fe to 413eaebaff27a2fd16f5cf68c1f4ff17 (for systemd_git.bb.do_package_write and systemd_git.bb.do_package_write) with this patch: Dependency on task linux-nokia900-meego_git.bb.do_package_write was added Dependency on task linux-nokia900-meego_git.bb.do_deploy was added Dependency on task linux-gta04_git.bb.do_deploy was removed Dependency on task linux-gta04_git.bb.do_package_write was removed Hash for dependent task systemd_git.bb.do_package_write changed from 730abebf9954794bb440c2f3239f79fe to 413eaebaff27a2fd16f5cf68c1f4ff17 Hash for dependent task systemd-serialgetty.bb.do_package_write changed from 153e91dfd1d2053fda7b98cc08d4b802 to 92a293bdd8ed234932b87a66025038c5 Signed-off-by: Martin Jansa --- lib/bb/siggen.py | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index f31d66a..ffe85dd 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -292,27 +292,18 @@ def compare_sigfiles(a, b): print "Variable %s value changed from %s to %s" % (dep, a_data['varvals'][dep], b_data['varvals'][dep]) if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data: - if len(a_data['runtaskdeps']) != len(b_data['runtaskdeps']): - a = clean_basepaths(a_data['runtaskhashes']) - b = clean_basepaths(b_data['runtaskhashes']) - changed, added, removed = dict_diff(a, b) - if added: - for dep in added: - print "Dependency on task %s was added" % (dep) - if removed: - for dep in removed: - print "Dependency on task %s was removed" % (dep) - if changed: - for dep in changed: - print "Hash for dependent task %s changed from %s to %s" % (dep, a[dep], b[dep]) - else: - for i in range(len(a_data['runtaskdeps'])): - aent = a_data['runtaskdeps'][i] - bent = b_data['runtaskdeps'][i] - aname = clean_basepath(aent) - bname = clean_basepath(bent) - if a_data['runtaskhashes'][aent] != b_data['runtaskhashes'][bent]: - print "Task dependency hash changed from %s to %s (for %s and %s)" % (a_data['runtaskhashes'][aent], b_data['runtaskhashes'][bent], aname, bname) + a = clean_basepaths(a_data['runtaskhashes']) + b = clean_basepaths(b_data['runtaskhashes']) + changed, added, removed = dict_diff(a, b) + if added: + for dep in added: + print "Dependency on task %s was added" % (dep) + if removed: + for dep in removed: + print "Dependency on task %s was removed" % (dep) + if changed: + for dep in changed: + print "Hash for dependent task %s changed from %s to %s" % (dep, a[dep], b[dep]) def dump_sigfile(a): p1 = pickle.Unpickler(file(a, "rb")) -- 1.7.8.4