From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mail.openembedded.org (Postfix) with ESMTP id 640FD71A13 for ; Wed, 28 Dec 2016 13:02:47 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP; 28 Dec 2016 05:02:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,422,1477983600"; d="scan'208";a="802981684" Received: from marquiz.fi.intel.com ([10.237.72.155]) by FMSMGA003.fm.intel.com with ESMTP; 28 Dec 2016 05:02:48 -0800 From: Markus Lehtonen To: openembedded-core@lists.openembedded.org Date: Wed, 28 Dec 2016 15:02:39 +0200 Message-Id: <1482930164-15721-4-git-send-email-markus.lehtonen@linux.intel.com> X-Mailer: git-send-email 2.6.6 In-Reply-To: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com> References: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com> Subject: [PATCH 3/8] oeqa.utils.metadata: drop 'unknown' git data elements 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, 28 Dec 2016 13:02:47 -0000 It's better just to not have the xml elements than to have elements with faux data. One could have git branch named 'unknown', for example. [YOCTO #10590] Signed-off-by: Markus Lehtonen --- meta/lib/oeqa/utils/metadata.py | 7 +++---- scripts/oe-selftest | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py index df6ed91..a389c6a 100644 --- a/meta/lib/oeqa/utils/metadata.py +++ b/meta/lib/oeqa/utils/metadata.py @@ -73,11 +73,10 @@ def get_layers(layers): try: repo = Repo(layer, search_parent_directories=True) revision, branch = repo.head.object.name_rev.split() - layer_dict[layer_name]['branch'] = branch - layer_dict[layer_name]['revision'] = revision except (InvalidGitRepositoryError, NoSuchPathError): - layer_dict[layer_name]['branch'] = 'unknown' - layer_dict[layer_name]['revision'] = 'unknown' + continue + layer_dict[layer_name]['branch'] = branch + layer_dict[layer_name]['revision'] = revision return layer_dict def write_metadata_file(file_path, metadata): diff --git a/scripts/oe-selftest b/scripts/oe-selftest index b4d911e..51c52f2 100755 --- a/scripts/oe-selftest +++ b/scripts/oe-selftest @@ -595,7 +595,7 @@ def main(): r_branches = set(r_branches.replace('origin/', '').split()) l_branches = {str(branch) for branch in repo.branches} branch = '%s/%s/%s' % (metadata['hostname'], - metadata['layers']['meta']['branch'], + metadata['layers']['meta'].get('branch', '(nogit)'), metadata['machine']) if branch in l_branches: @@ -623,7 +623,7 @@ def main(): layer_info = '' for layer, values in metadata['layers'].items(): layer_info = '%s%-17s = %s:%s\n' % (layer_info, layer, - values['branch'], values['revision']) + values.get('branch', '(nogit)'), values.get('revision', '0'*40)) msg = 'Selftest for build %s of %s for machine %s on %s\n\n%s' % ( log_prefix[12:], metadata['distro']['pretty_name'], metadata['machine'], metadata['hostname'], layer_info) -- 2.6.6