[oe-commits] [openembedded-core] 03/08: package_deb: Handle / in dependency name

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 0f2806a9806b524d173e0306f7fd2834a8129404
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Jan 9 11:22:54 2018 +0000

    package_deb: Handle / in dependency name
    
    We can end up with / in dependency names from file dependencies but the
    deb format doesn't allow this. Filter the names to allow such dependencies
    to work. Names have to start with an alphanumeric digit so also handle this.
    
    This allows for future handling of "per file" dependencies similarly to
    the rpm backend, bring parity to the functionality of the backends.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package_deb.bbclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 5d29793..2e8d17d 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -230,9 +230,11 @@ def deb_write_pkg(pkg, d):
             #   '>' = greater or equal
             # adjust these to the '<<' and '>>' equivalents
             #
-            for dep in var:
-                if '(' in dep:
-                    newdep = re.sub(r'[(:)]', '__', dep)
+            for dep in list(var.keys()):
+                if '(' in dep or '/' in dep:
+                    newdep = re.sub(r'[(:)/]', '__', dep)
+                    if newdep.startswith("__"):
+                        newdep = "A" + newdep
                     if newdep != dep:
                         var[newdep] = var[dep]
                         del var[dep]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.