diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-devtools/apt/apt-native.inc | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: 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: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
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 'meta/recipes-devtools/apt/apt-native.inc')
-rw-r--r-- | meta/recipes-devtools/apt/apt-native.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc index 9fa206efe1..68f1b3ce2c 100644 --- a/meta/recipes-devtools/apt/apt-native.inc +++ b/meta/recipes-devtools/apt/apt-native.inc | |||
@@ -17,14 +17,14 @@ python do_install () { | |||
17 | } | 17 | } |
18 | 18 | ||
19 | python do_install_config () { | 19 | python do_install_config () { |
20 | indir = os.path.dirname(d.getVar('FILE', True)) | 20 | indir = os.path.dirname(d.getVar('FILE')) |
21 | infile = open(oe.path.join(indir, 'files', 'apt.conf'), 'r') | 21 | infile = open(oe.path.join(indir, 'files', 'apt.conf'), 'r') |
22 | data = infile.read() | 22 | data = infile.read() |
23 | infile.close() | 23 | infile.close() |
24 | 24 | ||
25 | data = d.expand(data) | 25 | data = d.expand(data) |
26 | 26 | ||
27 | outdir = oe.path.join(d.getVar('D', True), d.getVar('sysconfdir', True), 'apt') | 27 | outdir = oe.path.join(d.getVar('D'), d.getVar('sysconfdir'), 'apt') |
28 | if not os.path.exists(outdir): | 28 | if not os.path.exists(outdir): |
29 | os.makedirs(outdir) | 29 | os.makedirs(outdir) |
30 | 30 | ||