[[PATCH][AUH] 1/3] Small fixes to use with Python3.

[[PATCH][AUH] 1/3] Small fixes to use with Python3.

[Aníbal Limón]

[YOCTO #9747]

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
 modules/recipe/svn.py         | 2 +-
 modules/utils/emailhandler.py | 2 +-
 upgradehelper.py              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/recipe/svn.py b/modules/recipe/svn.py
index 6d60529..6dadafd 100644
--- a/modules/recipe/svn.py
+++ b/modules/recipe/svn.py
@@ -22,7 +22,7 @@
 # Marius Avram      <marius.avram@intel.com>
 #
 
-from base import Recipe
+from recipe.base import Recipe
 
 class SvnRecipe(Recipe):
     pass
diff --git a/modules/utils/emailhandler.py b/modules/utils/emailhandler.py
index 970fb59..8436364 100644
--- a/modules/utils/emailhandler.py
+++ b/modules/utils/emailhandler.py
@@ -33,7 +33,7 @@ from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
 from email.generator import Generator
 import shutil
-from cStringIO import StringIO
+from io import StringIO
 
 class Email(object):
     def __init__(self, settings):
diff --git a/upgradehelper.py b/upgradehelper.py
index d4b8afb..499c539 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # vim: set ts=4 sw=4 et:
 #
 # Copyright (c) 2013 - 2014 Intel Corporation
@@ -40,7 +40,7 @@ from logging import critical as C
 import re
 import signal
 import sys
-import ConfigParser as cp
+import configparser as cp
 from datetime import datetime
 from datetime import date
 import shutil
-- 
2.1.4

[[PATCH][AUH] 2/3] upgradehelper.py: Move build of gcc runtime after discover packages

[Aníbal Limón]

If no packages are found to upgrade, it didn't make sense to build
gcc runtime before is only a waste of time.

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
 upgradehelper.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/upgradehelper.py b/upgradehelper.py
index 499c539..386cbcc 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -500,20 +500,6 @@ class Updater(object):
         return pkgs_to_upgrade_ordered
 
     def run(self, package_list=None):
-        I(" Building gcc runtimes ...")
-        for machine in self.opts['machines']:
-            I("  building gcc runtime for %s" % machine)
-            try:
-                self.bb.complete("gcc-runtime", machine)
-            except Exception as e:
-                E(" Can't build gcc-runtime for %s." % machine)
-
-                if isinstance(e, Error):
-                    E(e.stdout)
-                else:
-                    import traceback
-                    traceback.print_exc(file=sys.stdout)
-
         pkgs_to_upgrade = self._order_pkgs_to_upgrade(
                 self._get_packages_to_upgrade(package_list))
         total_pkgs = len(pkgs_to_upgrade)
@@ -532,6 +518,21 @@ class Updater(object):
             pkgs_ctx[p]['base_dir'] = self.uh_recipes_all_dir
         I(" ############################################################")
 
+        if pkgs_to_upgrade:
+            I(" Building gcc runtimes ...")
+            for machine in self.opts['machines']:
+                I("  building gcc runtime for %s" % machine)
+                try:
+                    self.bb.complete("gcc-runtime", machine)
+                except Exception as e:
+                    E(" Can't build gcc-runtime for %s." % machine)
+
+                    if isinstance(e, Error):
+                        E(e.stdout)
+                    else:
+                        import traceback
+                        traceback.print_exc(file=sys.stdout)
+
         succeeded_pkgs_ctx = []
         failed_pkgs_ctx = []
         attempted_pkgs = 0
-- 
2.1.4

[[PATCH][AUH] 3/3] upgradehelper.py: Disable _order_pkgs_to_upgrade functionality

[Aníbal Limón]

The _order_pkgs_to_upgrade function order a set of packages to
be upgraded based on bitbake dependency graph, currently _order_pkgs_to_upgrade
is broken so disable it while fix.

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
 upgradehelper.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/upgradehelper.py b/upgradehelper.py
index 386cbcc..239fd88 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -500,8 +500,9 @@ class Updater(object):
         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._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)
 
         pkgs_ctx = {}
-- 
2.1.4

Re: [[PATCH][AUH] 3/3] upgradehelper.py: Disable _order_pkgs_to_upgrade functionality

[Leonardo Sandoval]

On 06/20/2016 04:27 PM, Aníbal Limón wrote:
> The _order_pkgs_to_upgrade function order a set of packages to
> be upgraded based on bitbake dependency graph, currently _order_pkgs_to_upgrade
> is broken so disable it while fix.
>
> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
> ---
>   upgradehelper.py | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/upgradehelper.py b/upgradehelper.py
> index 386cbcc..239fd88 100755
> --- a/upgradehelper.py
> +++ b/upgradehelper.py
> @@ -500,8 +500,9 @@ class Updater(object):
>           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._order_pkgs_to_upgrade(
> +        #        self._get_packages_to_upgrade(package_list))
are these commented lines intended to be on the patch?
> +        pkgs_to_upgrade = self._get_packages_to_upgrade(package_list)
>           total_pkgs = len(pkgs_to_upgrade)
>   
>           pkgs_ctx = {}