[oe-commits] [openembedded-core] 14/22: package-deb: Ignore circular dependencies

[git at git.openembedded.org]

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

commit 30e444db8f869fd1e4bb0529847560ae3a1ea673
Author: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
AuthorDate: Thu Mar 10 14:47:09 2016 +0100

    package-deb: Ignore circular dependencies
    
    If a package depends on itself apt-get fails to install it with the
    error attached to this patch.
    
    This patch checks for this conditions and notifies the user so the
    recipe maintainer can fix his RDEPENDS variable.
    
    root at qt5022:~# apt-get install perl-module-cpan
    Reading package lists... Done
    Building dependency tree
    Reading state information... Done
    The following NEW packages will be installed:
      perl-module-cpan
    0 upgraded, 640 newly installed, 0 to remove and 0 not upgraded.
    Need to get 0 B/5964 kB of archives.
    After this operation, 0 B of additional disk space will be used.
    Do you want to continue? [Y/n]
    E: Internal error: MaxLoopCount reached in SmartUnPack (2) for
    perl-module-cpan:amd64, aborting
    E: Internal error, packages left unconfigured. perl-module-cpan:amd64
    root at qt5022:~# apt-get install perl-modules
    
    Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/package_deb.bbclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 6ecea0e..e1d05a7 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -235,6 +235,9 @@ python do_package_deb () {
         rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS", True) or "")
         debian_cmp_remap(rdepends)
         for dep in rdepends.keys():
+                if dep == pkg:
+                        del rdepends[dep]
+                        continue
                 if '*' in dep:
                         del rdepends[dep]
         rrecommends = bb.utils.explode_dep_versions2(localdata.getVar("RRECOMMENDS", True) or "")

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