[PATCH 0/2] A couple of buildhistory-diff fixes

[PATCH 0/2] A couple of buildhistory-diff fixes

[Paul Eggleton]

The following changes since commit 363424cdc78cafa278008f973c2b4288297ebf8c:

  image.bbclass: Ensure ${S} is cleaned at the start of rootfs generation (2012-05-25 11:28:00 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/buildhistory-fixes6
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/buildhistory-fixes6

Paul Eggleton (2):
  buildhistory_analysis: fix error when version specifier missing
  scripts/buildhistory-diff: add GitPython version check

 meta/lib/oe/buildhistory_analysis.py |    2 +-
 scripts/buildhistory-diff            |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

-- 
1.7.9.5

[PATCH 1/2] buildhistory_analysis: fix error when version specifier missing

[Paul Eggleton]

Passing None to split_versions() will raise an exception, so check that
the version is specified before passing it in.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/lib/oe/buildhistory_analysis.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py
index 313416c..29dc4a9 100644
--- a/meta/lib/oe/buildhistory_analysis.py
+++ b/meta/lib/oe/buildhistory_analysis.py
@@ -272,7 +272,7 @@ def compare_pkg_lists(astr, bstr):
         if k in depverb:
             dva = depvera[k]
             dvb = depverb[k]
-            if dva != dvb:
+            if dva and dvb and dva != dvb:
                 if bb.utils.vercmp(split_version(dva), split_version(dvb)) < 0:
                     remove.append(k)
 
-- 
1.7.9.5

[PATCH 2/2] scripts/buildhistory-diff: add GitPython version check

[Paul Eggleton]

Display an error if the user does not have at least version 0.3.1 of
GitPython installed.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 scripts/buildhistory-diff |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff
index 9936a4b..3f27eab 100755
--- a/scripts/buildhistory-diff
+++ b/scripts/buildhistory-diff
@@ -7,16 +7,20 @@
 
 import sys
 import os
+from distutils.version import LooseVersion
 
 # Ensure PythonGit is installed (buildhistory_analysis needs it)
 try:
     import git
 except ImportError:
-    print("Please install PythonGit 0.3.1 or later in order to use this script")
+    print("Please install GitPython (python-git) 0.3.1 or later in order to use this script")
     sys.exit(1)
 
-
 def main():
+    if LooseVersion(git.__version__) < '0.3.1':
+        print("Version of GitPython is too old, please install GitPython (python-git) 0.3.1 or later in order to use this script")
+        sys.exit(1)
+
     if (len(sys.argv) < 3):
         print("Report significant differences in the buildhistory repository")
         print("Syntax: %s <buildhistory-path> <since-revision> [to-revision]" % os.path.basename(sys.argv[0]))
-- 
1.7.9.5

Re: [PATCH 0/2] A couple of buildhistory-diff fixes

[Richard Purdie]

On Mon, 2012-05-28 at 13:57 +0100, Paul Eggleton wrote:
> The following changes since commit 363424cdc78cafa278008f973c2b4288297ebf8c:
> 
>   image.bbclass: Ensure ${S} is cleaned at the start of rootfs generation (2012-05-25 11:28:00 +0100)
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/openembedded-core-contrib paule/buildhistory-fixes6
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/buildhistory-fixes6
> 
> Paul Eggleton (2):
>   buildhistory_analysis: fix error when version specifier missing
>   scripts/buildhistory-diff: add GitPython version check

Merged to master, thanks.

Richard