From 7af6721b4520ee96209e482bd66247afcfa7b4e5 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Wed, 14 Sep 2016 14:03:16 -0500 Subject: [PATCH] Fix regression for proprietary packages The proprietary packages index should never be present in the package index. This change makes sure that anything using the proprietary key is fully ignored. Closes-Bug: 1622275 Change-Id: I5f084487c1085868eac84bcccadc85c43ec63caa Signed-off-by: Kevin Carter --- lookup/py_pkgs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lookup/py_pkgs.py b/lookup/py_pkgs.py index 546d34b..68e192b 100644 --- a/lookup/py_pkgs.py +++ b/lookup/py_pkgs.py @@ -600,6 +600,9 @@ class DependencyFileProcessor(object): :type pip_packages: ``bool`` """ if [i for i in pkg_constant if i in pkg_var_name]: + if 'proprietary' in pkg_var_name: + return + self._package_build_index( packages=packages, role_name=role_name, @@ -614,8 +617,6 @@ class DependencyFileProcessor(object): return elif 'optional' in pkg_var_name: return - elif 'proprietary' in pkg_var_name: - return else: self._package_build_index( packages=packages,