From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id DD5046058C for ; Fri, 15 Mar 2019 15:46:00 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com ([147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id x2FFk2fc013314 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Fri, 15 Mar 2019 08:46:02 -0700 (PDT) Received: from soho-mhatle-m.local (172.25.36.235) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.3.439.0; Fri, 15 Mar 2019 08:46:01 -0700 To: Robert Yang , References: <8074fc829447468b0f42672f17f31b83d3f3888b.1552555629.git.liezhi.yang@windriver.com> <645179f8-eeb2-a08b-a7b9-4b680d71a27c@windriver.com> From: Mark Hatle Openpgp: preference=signencrypt Autocrypt: addr=mark.hatle@windriver.com; prefer-encrypt=mutual; keydata= mQENBFYKxFgBCACt/pzutBp6p/xVKTFJjHbM3KpQKCblyot/YP+bpTr51Hrc5xDXBQhoG7TC aIRvRIvbhEevEQK9y04gW3JK/5lobq5ORebolcsHlYBUvpNeIPjupLQwGvz/TPtrLRNGLqDC rvsM6OA2XbQ2bwzxWaSQS3ImE2O2iXOZn9HhThMGeDB4Nff3fgUvXOTDIrgWOn9K2DgLL7Yc zkUIlFdj+Nraksd/7BSk8oH6tjeBVhFqSFvKta9QxWgdr58oPaTYaW/xNqUjlLrbJuMw/MSe xzuYfdfDfm6J8kRjMOnwQ0n8svJElzqAk+d83ow38gpGQ+LkjGgnf8ZFJ4rUJFADroX3ABEB AAG0JU1hcmsgSGF0bGUgPG1hcmsuaGF0bGVAd2luZHJpdmVyLmNvbT6JATcEEwEIACEFAlYK xFgCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQfv796/r0vvlvZAf9Gs+eN320yhRW V/fZCsngKhmOK4v3HrTwFrkSmoD9QHQiE/5IPdNacHwIPwZx07tNBohB8xOeNqCPRYRBwGhA AnxKOPyd0nnm6ZhPzbA57v4x3IGRQr4QzvcBTASJq91l3Ew4lpAslyx5w1DPPqRD7G8ycDKg peKyDwmdkvCunVisSAQI3XIMq2y230biTO98tDPEezg+lg+yTsz9ZT33F5KNuWrpf8VL5fG/ mt+kAv7wtsx/KTRbqhH3iFXF6eBSwMjAfTXFlkLfbM9riJGXrWEl9n2S2R3cDHNHug0lb8f4 whK370KEO4OwRKIYW/VUBmzk5XZUE9DTlDSV8ycsrrkBDQRWCsRYAQgAwK3FuHCE+HW3YWdH PUjeSn5p//xJ57u8g2rng8zm9zNjmYgpPv5UxozaD9i2jf4mlQLHGGOezhHae8K4Nj70oVcv 8AmwcrJa9i9WL1oy/9R3fHMWf/Ctt9VXTO0qlCuq6PDzaUfvsXR61aJIjTKNQTOjCLjY1vXm VSewUgARysmA8WrjTfwGBihMBxAX0+kIjx8nOlam0WvekMBXZ0AbS56oTLRxYao6DI3GeB/N oWPy/5DfuTKaSdM0Pf8al20x9RuNN5/HLMlyDH/k8bIa1xd9aAqW+Feiw5gC107V2E6ULyIy q6em2UrsmIRxrvpHqbNgQKqvTehJ+V/i4g/uOwARAQABiQEfBBgBCAAJBQJWCsRYAhsMAAoJ EH7+/ev69L755XAH/3ZcNhooqd9OBhFkvXm1iWZ8EoC7motWqVn2oEyxoonsg8AD9kFXiN+T dYp7dH99EZu9q4ptj56AXm4uHzOgywL/5/V2TY6twCGAjUGzDjAB5gzoi+JLIBlDiyOip0eL QswIhRk473xy3j8DA4oVamnSPWgyNJ+qsdt37YWDzoDFFvtDoRU7Eb+znfIMDKzlny0XU/8L cW1bNHJlpv/78GPdfP4tjysEd8MuA5jf5o5w4XqcwTqalffEJtQ/s3pbkstEi7qm5uPui5Kt gq6YYLSqcSNe0GWAF9/T+qwyo7burSTxUWCWtMmlXdAQLW9SynLhB3Jbch0nFAh0fCKi6yY= Organization: Wind River Systems Message-ID: Date: Fri, 15 Mar 2019 10:46:00 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.5.3 MIME-Version: 1.0 In-Reply-To: <645179f8-eeb2-a08b-a7b9-4b680d71a27c@windriver.com> Subject: Re: [PATCH 4/5] fetch2/gitsm: Add clean function X-BeenThere: bitbake-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussion that advance bitbake development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2019 15:46:01 -0000 Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit On 3/14/19 9:52 PM, Robert Yang wrote: > Hi Mark, > > On 3/14/19 10:41 PM, Mark Hatle wrote: >> On 3/14/19 4:28 AM, Robert Yang wrote: >>> The git's clean can only remove parent git repo from DL_DIR, but doesn't remove >>> submodules, this patch fixes the problem. >>> >>> Signed-off-by: Robert Yang >>> --- >>> bitbake/lib/bb/fetch2/gitsm.py | 15 +++++++++++++-- >>> 1 file changed, 13 insertions(+), 2 deletions(-) >>> >>> diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py >>> index b21fed2..bb61093 100644 >>> --- a/bitbake/lib/bb/fetch2/gitsm.py >>> +++ b/bitbake/lib/bb/fetch2/gitsm.py >>> @@ -76,8 +76,8 @@ class GitSM(Git): >>> for name in ud.names: >>> try: >>> gitmodules = runfetchcmd("%s show %s:.gitmodules" % (ud.basecmd, ud.revisions[name]), d, quiet=True, workdir=workdir) >>> - except: >>> - # No submodules to update >>> + except Exception as esc: >>> + logger.info("No submodules found: %s" % workdir) >> >> We don't want the log message. git submodules are processed recursively, and >> the end of the recursion will -always- have 'gitsm' items that have no >> submodules. This is also why it was a generic except, because we really don't >> care WHAT the exception is, only that if one happens -- we know the command >> failed and to simply ignore it and finish the iteration. >> >> continue >>> >>> for m, md in parse_gitmodules(gitmodules).items(): >>> @@ -164,6 +164,17 @@ class GitSM(Git): >>> Git.download(self, ud, d) >>> self.process_submodules(ud, ud.clonedir, download_submodule, d) >>> >>> + def clean(self, ud, d): >>> + def clean_submodule(ud, url, module, modpath, d): >>> + try: >>> + newfetch = Fetch([url], d, cache=False) >>> + newfetch.clean() >>> + except Exception as e: >>> + logger.warn('gitsm: submodule clean failed: %s %s' % (type(e).__name__, str(e))) >>> + >>> + self.process_submodules(ud, ud.clonedir, clean_submodule, d) >>> + Git.clean(self, ud, d) >>> + >> >> I don't see 'clean_submodule' implemented in this patch. The process_submodules >> will simply call that function, if it's not defined it will error or not do >> anything if it finds a submodule. > > > The clean_submodule is inside of 'def clean', right under 'def clean': > > + def clean(self, ud, d): > + def clean_submodule(ud, url, module, modpath, d): Apparently I'm blind. :) --Mark > // Robert > >> >>> def unpack(self, ud, destdir, d): >>> def unpack_submodules(ud, url, module, modpath, d): >>> url += ";bareclone=1;nobranch=1" >>> >> >>