From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [80.91.229.2] (helo=ciao.gmane.org) by linuxtogo.org with esmtp (Exim 4.69) (envelope-from ) id 1MJ2Zr-00074j-Dl for openembedded-devel@openembedded.org; Tue, 23 Jun 2009 11:46:07 +0200 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1MJ2P8-0000xC-Io for openembedded-devel@openembedded.org; Tue, 23 Jun 2009 09:35:02 +0000 Received: from s55917625.adsl.wanadoo.nl ([85.145.118.37]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 23 Jun 2009 09:35:02 +0000 Received: from k.kooi by s55917625.adsl.wanadoo.nl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 23 Jun 2009 09:35:02 +0000 X-Injected-Via-Gmane: http://gmane.org/ To: openembedded-devel@openembedded.org From: Koen Kooi Date: Tue, 23 Jun 2009 11:15:55 +0200 Message-ID: References: <200906230941.30107.marcin@juszkiewicz.com.pl> <1245747394-31806-7-git-send-email-marcin@juszkiewicz.com.pl> Mime-Version: 1.0 X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: s55917625.adsl.wanadoo.nl User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1pre) Gecko/20090610 Shredder/3.0b3pre In-Reply-To: <1245747394-31806-7-git-send-email-marcin@juszkiewicz.com.pl> Sender: news Subject: Re: [STABLE][PATCH 046/125] Shorten some full paths printed to the user. X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2009 09:46:07 -0000 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 23-06-09 10:56, Marcin Juszkiewicz wrote: > From: Chris Larson > > Adds a base_path_out convenience function, which prepares a full path for > display to the user. The initial implementation just makes it relative to > ${TOPDIR}. This function is then used for some messages outputted to the > user (packaged-staging, patch application, clean, unpack tasks). > > Signed-off-by: Chris Larson > Signed-off-by: Marcin Juszkiewicz Acked-by: Koen Kooi > --- > classes/base.bbclass | 17 +++++++++++++---- > classes/packaged-staging.bbclass | 2 +- > classes/patch.bbclass | 2 +- > 3 files changed, 15 insertions(+), 6 deletions(-) > > diff --git a/classes/base.bbclass b/classes/base.bbclass > index 3d4a426..e622aee 100644 > --- a/classes/base.bbclass > +++ b/classes/base.bbclass > @@ -39,6 +39,14 @@ def base_path_relative(src, dest): > > return sep.join(relpath) > > +def base_path_out(path, d): > + """ Prepare a path for display to the user. """ > + rel = base_path_relative(d.getVar("TOPDIR", 1), path) > + if len(rel)> len(path): > + return path > + else: > + return rel > + > # for MD5/SHA handling > def base_chk_load_parser(config_paths): > import ConfigParser, os, bb > @@ -69,6 +77,7 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data): > > # md5 and sha256 should be valid now > if not os.path.exists(localpath): > + localpath = base_path_out(localpath, data) > bb.note("The localpath does not exist '%s'" % localpath) > raise Exception("The path does not exist '%s'" % localpath) > > @@ -497,11 +506,11 @@ python base_do_clean() { > """clear the build and temp directories""" > dir = bb.data.expand("${WORKDIR}", d) > if dir == '//': raise bb.build.FuncFailed("wrong DATADIR") > - bb.note("removing " + dir) > + bb.note("removing " + base_path_out(dir, d)) > os.system('rm -rf ' + dir) > > dir = "%s.*" % bb.data.expand(bb.data.getVar('STAMP', d), d) > - bb.note("removing " + dir) > + bb.note("removing " + base_path_out(dir, d)) > os.system('rm -f '+ dir) > } > > @@ -556,7 +565,7 @@ python base_do_distclean() { > except bb.MalformedUrl, e: > bb.debug(1, 'Unable to generate local path for malformed uri: %s' % e) > else: > - bb.note("removing %s" % local) > + bb.note("removing %s" % base_path_out(local, d)) > try: > if os.path.exists(local + ".md5"): > os.remove(local + ".md5") > @@ -777,7 +786,7 @@ def oe_unpack_file(file, data, url = None): > os.chdir(newdir) > > cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd) > - bb.note("Unpacking %s to %s/" % (file, os.getcwd())) > + bb.note("Unpacking %s to %s/" % (base_path_out(file, data), base_path_out(os.getcwd(), data))) > ret = os.system(cmd) > > os.chdir(save_cwd) > diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass > index 82c1a0d..bd7b9ea 100644 > --- a/classes/packaged-staging.bbclass > +++ b/classes/packaged-staging.bbclass > @@ -135,7 +135,7 @@ do_clean_prepend() { > pstage_cleanpackage(removepkg, d) > > stagepkg = bb.data.expand("${PSTAGE_PKG}", d) > - bb.note("Removing staging package %s" % stagepkg) > + bb.note("Removing staging package %s" % base_path_out(stagepkg, d)) > os.system('rm -rf ' + stagepkg) > } > > diff --git a/classes/patch.bbclass b/classes/patch.bbclass > index 8d2bde0..2f99e4c 100644 > --- a/classes/patch.bbclass > +++ b/classes/patch.bbclass > @@ -527,7 +527,7 @@ python patch_do_patch() { > bb.note("Patch '%s' applies to earlier revisions" % pname) > continue > > - bb.note("Applying patch '%s' (%s)" % (pname, unpacked)) > + bb.note("Applying patch '%s' (%s)" % (pname, base_path_out(unpacked, d))) > try: > patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True) > except: