Fix PE handling to use strings and update showVersions to add PE support (closes #2027)

4 files changed, 8 insertions, 8 deletions

diff --git a/lib/bb/cache.py b/lib/bb/cache.py
index 0a0540fd5..335b22197 100644
--- a/lib/bb/cache.py
+++ b/lib/bb/cache.py
@@ -254,7 +254,7 @@ class Cache:
         """
 
         pn       = self.getVar('PN', file_name, True)
-        pe       = int(self.getVar('PE', file_name, True) or "0")
+        pe       = self.getVar('PE', file_name, True) or "0"
         pv       = self.getVar('PV', file_name, True)
         pr       = self.getVar('PR', file_name, True)
         dp       = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0")
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 6608a87a7..4b2a90613 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -111,7 +111,7 @@ class BBCooker:
 
         return self.tryBuildPackage(fn, item, self.configuration.cmd, the_data, build_depends)
 
-    def showVersions( self ):
+    def showVersions(self):
         pkg_pn = self.status.pkg_pn
         preferred_versions = {}
         latest_versions = {}
@@ -130,11 +130,11 @@ class BBCooker:
             latest = latest_versions[p]
 
             if pref != latest:
-                prefstr = pref[0][0] + "-" + pref[0][1]
+                prefstr = pref[0][0] + ":" + pref[0][1] + '-' + pref[0][2]
             else:
                 prefstr = ""
 
-            print "%-30s %20s %20s" % (p, latest[0][0] + "-" + latest[0][1],
+            print "%-30s %20s %20s" % (p, latest[0][0] + ":" + latest[0][1] + "-" + latest[0][2],
                                         prefstr)
 
 
diff --git a/lib/bb/providers.py b/lib/bb/providers.py
index 39b3842b3..78f45122f 100644
--- a/lib/bb/providers.py
+++ b/lib/bb/providers.py
@@ -90,7 +90,7 @@ def findBestProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
         else:
             pv_str = preferred_v
         if not (preferred_e is None):
-            pv_str = '%d:%s' % (preferred_e, pv_str)
+            pv_str = '%s:%s' % (preferred_e, pv_str)
         itemstr = ""
         if item:
             itemstr = " (for item %s)" % item
@@ -173,10 +173,10 @@ def filterProviders(providers, item, cfgData, dataCache):
                 continue
             oldver = "%s-%s" % (pv, pr)
             if pe > 0:
-                oldver = "%d:%s" % (pe, oldver)
+                oldver = "%s:%s" % (pe, oldver)
             newver = "%s-%s" % (newvers[1], newvers[2])
             if newvers[0] > 0:
-                newver = "%d:%s" % (newvers[0], newver)
+                newver = "%s:%s" % (newvers[0], newver)
             if (newver != oldver):
                 extra_chat = "%s (%s) already staged but upgrading to %s to satisfy %s" % (pn, oldver, newver, item)
             else:
diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index f8860ff24..c2884f263 100644
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -65,7 +65,7 @@ def vercmp(ta, tb):
     (ea, va, ra) = ta
     (eb, vb, rb) = tb
 
-    r = ea-eb
+    r = int(ea)-int(eb)
     if (r == 0):
         r = vercmp_part(va, vb)
     if (r == 0):