commit 2ec70eda60cc52dcae3d2898886cd6d1825f1b91
author Mike Frysinger <vapier@chromium.org> Sun Aug 17 19:28:34 2014 -0400
committer Mike Frysinger <vapier@chromium.org> Sun Aug 17 23:29:58 2014 +0000
tree 691841a339baae934024a6c0c48dc4eb784e7dfb
parent 4bcd9fa6db7ec490449aed787278366798a5a403

pre-upload: fix chromite usage after license shuffle

The license module in chromite was shuffled around.

BUG=None
TEST=`repo upload` no longer chokes

Change-Id: Iabe5ad2b2735bdb84708bae7acb81a7d241fab3f
Reviewed-on: https://chromium-review.googlesource.com/212870
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

pre-upload.py

diff --git a/pre-upload.py b/pre-upload.py
index 6f98e5b..511c8cb 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -30,7 +30,7 @@
   sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), '..', '..'))
 
 from chromite.lib import patch
-from chromite.licensing import licenses
+from chromite.licensing import licenses_lib
 
 PRE_SUBMIT = 'pre-submit'
 
@@ -656,7 +656,7 @@
       continue
 
     try:
-      license_types = licenses.GetLicenseTypesFromEbuild(ebuild)
+      license_types = licenses_lib.GetLicenseTypesFromEbuild(ebuild)
     except ValueError as e:
       return HookFailure(e.message, [ebuild])
 
@@ -664,7 +664,7 @@
     for license_type in [x for x in license_types
                          if x not in LICENSES_IGNORE and not x.endswith('?')]:
       try:
-        licenses.Licensing.FindLicenseType(license_type)
+        licenses_lib.Licensing.FindLicenseType(license_type)
       except AssertionError as e:
         return HookFailure(e.message, [ebuild])