[oe] [STABLE][PATCH 046/125] Shorten some full paths printed to the user.
Koen Kooi
k.kooi at student.utwente.nl
Tue Jun 23 09:15:55 UTC 2009
On 23-06-09 10:56, Marcin Juszkiewicz wrote:
> From: Chris Larson<clarson at mvista.com>
>
> 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<clarson at mvista.com>
> Signed-off-by: Marcin Juszkiewicz<marcin at juszkiewicz.com.pl>
Acked-by: Koen Kooi <koen at openembedded.org>
> ---
> 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:
More information about the Openembedded-devel
mailing list