From 6ac7e9b5981872b22dcd07f0f7171e1f7c10e284 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 15 May 2012 11:06:22 -0500 Subject: update-alternatives.bbclass: Refactor the implementation Refactor in order to: * Deprecate the old interfaces, but keep them for compatibility * Provide a new, interface -- capable of working with split packages * Each update-alternative will now set proper "per-file" provides Note: this adds a warning message when the older deprecated behavior is used. The older behavior has been fully tested using oe-core. (From OE-Core rev: 309117d26de6a87b16406a44a0cefcbaaf7b5d7a) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'meta/classes/package.bbclass') diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 8b0ac55b76..58320dd7ef 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1156,6 +1156,15 @@ python package_do_filedeps() { rpmdeps = d.expand("${RPMDEPS}") r = re.compile(r'[<>=]+ +[^ ]*') + def file_translate(file): + ft = file.replace("@", "@at@") + ft = ft.replace(" ", "@space@") + ft = ft.replace("\t", "@tab@") + ft = ft.replace("[", "@openbrace@") + ft = ft.replace("]", "@closebrace@") + ft = ft.replace("_", "@underscore@") + return ft + # Quick routine to process the results of the rpmdeps call... def process_deps(pipe, pkg, provides_files, requires_files): provides = {} @@ -1173,12 +1182,7 @@ python package_do_filedeps() { continue file = f.replace(pkgdest + "/" + pkg, "") - file = file.replace("@", "@at@") - file = file.replace(" ", "@space@") - file = file.replace("\t", "@tab@") - file = file.replace("[", "@openbrace@") - file = file.replace("]", "@closebrace@") - file = file.replace("_", "@underscore@") + file = file_translate(file) value = line.split(":", 1)[1].strip() value = r.sub(r'(\g<0>)', value) -- cgit v1.2.3-54-g00ecf