[yocto] [auh][PATCH 11/20] upgradehelper.py: remove the package ordering code

[Alexander Kanavin]

From: Alexander Kanavin <alex.kanavin at gmail.com>

It was broken and commented out, and not really necessary.

Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
---
 upgradehelper.py | 80 --------------------------------------------------------
 1 file changed, 80 deletions(-)

diff --git a/upgradehelper.py b/upgradehelper.py
index 9fa79b4..d62c9b2 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -439,87 +439,7 @@ class Updater(object):
         else:
             W("No recipes attempted, not sending status mail!")
 
-    def _order_pkgs_to_upgrade(self, pkgs_to_upgrade):
-        def _get_pn_dep_dic(pn_list, dependency_file): 
-            import re
-
-            pn_dep_dic = {}
-
-            with open(dependency_file) as dep:
-                data = dep.read()
-                dep.close()
-
-                for line in data.split('\n'):
-                    m = re.search('^"(.*)" -> "(.*)"$', line)
-                    if not m:
-                        continue
-
-                    pn = m.group(1)
-                    pn_dep = m.group(2)
-                    if pn == pn_dep:
-                        continue
-
-                    if pn in pn_list:
-                        if pn_dep in pn_list:
-                            if pn in pn_dep_dic.keys():
-                                pn_dep_dic[pn].append(pn_dep)
-                            else:
-                                pn_dep_dic[pn] = [pn_dep]
-                        elif not pn in pn_dep_dic.keys():
-                            pn_dep_dic[pn] = []
-
-            return pn_dep_dic
-
-        def _dep_resolve(graph, node, resolved, seen):
-            seen.append(node)
-
-            for edge in graph[node]:
-                if edge not in resolved:
-                    if edge in seen:
-                        raise RuntimeError("Packages %s and %s have " \
-                                "a circular dependency." \
-                                % (node, edge))
-                    _dep_resolve(graph, edge, resolved, seen)
-
-            resolved.append(node)
-
-
-        pn_list = []
-        for pn, new_ver, maintainer in pkgs_to_upgrade:
-            pn_list.append(pn)
-
-        try:
-           self.bb.dependency_graph(' '.join(pn_list))
-        except Error as e:
-            multiple_providers = False
-            for l in e.stdout.split('\n'):
-                if l.find("ERROR: Multiple .bb files are due to be built which each provide") == 0:
-                    multiple_providers = True
-            if not multiple_providers:
-                raise e
-
-        dependency_file = os.path.join(get_build_dir(), "pn-depends.dot")
-
-        pkgs_to_upgrade_ordered = []
-        pn_list_ordered = []
-
-        pn_dep_dic = _get_pn_dep_dic(pn_list, dependency_file)
-        if pn_dep_dic:
-            root = "__root_node__"
-            pn_dep_dic[root] = pn_dep_dic.keys()
-            _dep_resolve(pn_dep_dic, root, pn_list_ordered, [])
-            pn_list_ordered.remove(root)
-
-        for pn_ordered in pn_list_ordered:
-            for pn, new_ver, maintainer in pkgs_to_upgrade:
-                if pn == pn_ordered: 
-                    pkgs_to_upgrade_ordered.append([pn, new_ver, maintainer])
-
-        return pkgs_to_upgrade_ordered
-
     def run(self, package_list=None):
-        #pkgs_to_upgrade = self._order_pkgs_to_upgrade(
-        #        self._get_packages_to_upgrade(package_list))
         pkgs_to_upgrade = self._get_packages_to_upgrade(package_list)
         total_pkgs = len(pkgs_to_upgrade)
 
-- 
2.15.0