Skip to contentSkip to conversation

1/3] Small fixes to use with Python3.

PATCH New Aníbal Limón 2 participants 4 messages Jun 20, 2016 – Jun 21, 2016

lore
Share & tools
lore

Aníbal Limón

author
#0 lore raw

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

[YOCTO #9747]

Signed-off-by Aníbal Limón <[email protected]>
---
 modules/recipe/svn.py         | 2 +-
 modules/utils/emailhandler.py | 2 +-
 upgradehelper.py              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
modules/recipe/svn.py +1 -1
index 6d60529..6dadafd 100644
@@ -22,7 +22,7 @@
 # Marius Avram      <[email protected]>
 #
 
-from base import Recipe
+from recipe.base import Recipe
 
 class SvnRecipe(Recipe):
     pass
modules/utils/emailhandler.py +1 -1
index 970fb59..8436364 100644
@@ -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):
upgradehelper.py +2 -2
index d4b8afb..499c539 100755
@@ -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
Signature · 1 line
2.1.4
author
#1 lore raw

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

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 <[email protected]>
---
 upgradehelper.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)
upgradehelper.py +15 -14
index 499c539..386cbcc 100755
@@ -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
Signature · 1 line
2.1.4
author
#2 lore raw

PATCH 1/1 3/3] upgradehelper.py: Disable _order_pkgs_to_upgrade functionality

In reply to 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 <[email protected]>
---
 upgradehelper.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
upgradehelper.py +3 -2
index 386cbcc..239fd88 100755
@@ -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 = {}
Signature · 1 line
2.1.4
#3 lore raw

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

Quoted 14 lines · 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 <[email protected]>
---
  upgradehelper.py | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
upgradehelper.py +0 -0
index 386cbcc..239fd88 100755

upgradehelper.py class Updater(object): · line 504

Quoted 7 lines
upgradehelper.py +2 -2
@@ -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?

Quoted 4 lines
upgradehelper.py +1 -0
+        pkgs_to_upgrade = self._get_packages_to_upgrade(package_list)
          total_pkgs = len(pkgs_to_upgrade)
 
          pkgs_ctx = {}