diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c0f2890c01882e9ea14e781c044f3a84f75bd0fc (patch) | |
tree | 0962d17b0bf752ba4c009fb624f044b89fd6fd87 /scripts/contrib | |
parent | c4e2c59088765d1f1de7ec57cde91980f887c2ff (diff) | |
download | poky-c0f2890c01882e9ea14e781c044f3a84f75bd0fc.tar.gz |
scripts: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 0a36bd96e6b29fd99a296efc358ca3e9fb5af735)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib')
-rwxr-xr-x | scripts/contrib/list-packageconfig-flags.py | 6 | ||||
-rwxr-xr-x | scripts/contrib/verify-homepage.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/contrib/list-packageconfig-flags.py b/scripts/contrib/list-packageconfig-flags.py index 389fb97f67..7ce718624a 100755 --- a/scripts/contrib/list-packageconfig-flags.py +++ b/scripts/contrib/list-packageconfig-flags.py | |||
@@ -76,7 +76,7 @@ def collect_pkgs(data_dict): | |||
76 | for fn in data_dict: | 76 | for fn in data_dict: |
77 | pkgconfigflags = data_dict[fn].getVarFlags("PACKAGECONFIG") | 77 | pkgconfigflags = data_dict[fn].getVarFlags("PACKAGECONFIG") |
78 | pkgconfigflags.pop('doc', None) | 78 | pkgconfigflags.pop('doc', None) |
79 | pkgname = data_dict[fn].getVar("P", True) | 79 | pkgname = data_dict[fn].getVar("P") |
80 | pkg_dict[pkgname] = sorted(pkgconfigflags.keys()) | 80 | pkg_dict[pkgname] = sorted(pkgconfigflags.keys()) |
81 | 81 | ||
82 | return pkg_dict | 82 | return pkg_dict |
@@ -124,9 +124,9 @@ def display_all(data_dict): | |||
124 | ''' Display all pkgs and PACKAGECONFIG information ''' | 124 | ''' Display all pkgs and PACKAGECONFIG information ''' |
125 | print(str("").ljust(50, '=')) | 125 | print(str("").ljust(50, '=')) |
126 | for fn in data_dict: | 126 | for fn in data_dict: |
127 | print('%s' % data_dict[fn].getVar("P", True)) | 127 | print('%s' % data_dict[fn].getVar("P")) |
128 | print(fn) | 128 | print(fn) |
129 | packageconfig = data_dict[fn].getVar("PACKAGECONFIG", True) or '' | 129 | packageconfig = data_dict[fn].getVar("PACKAGECONFIG") or '' |
130 | if packageconfig.strip() == '': | 130 | if packageconfig.strip() == '': |
131 | packageconfig = 'None' | 131 | packageconfig = 'None' |
132 | print('PACKAGECONFIG %s' % packageconfig) | 132 | print('PACKAGECONFIG %s' % packageconfig) |
diff --git a/scripts/contrib/verify-homepage.py b/scripts/contrib/verify-homepage.py index d39dd1d973..76f1749cfa 100755 --- a/scripts/contrib/verify-homepage.py +++ b/scripts/contrib/verify-homepage.py | |||
@@ -44,7 +44,7 @@ def verifyHomepage(bbhandler): | |||
44 | if realfn in checked: | 44 | if realfn in checked: |
45 | continue | 45 | continue |
46 | data = bbhandler.parse_recipe_file(realfn) | 46 | data = bbhandler.parse_recipe_file(realfn) |
47 | homepage = data.getVar("HOMEPAGE", True) | 47 | homepage = data.getVar("HOMEPAGE") |
48 | if homepage: | 48 | if homepage: |
49 | try: | 49 | try: |
50 | urllib.request.urlopen(homepage, timeout=5) | 50 | urllib.request.urlopen(homepage, timeout=5) |