sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

apt-native: fix the creation of apt.conf.sample 

1.The file of "apt.conf.sample" is in the outdir, and outdir is assigned
by "os.path.join" with the params of ${D}, ${sysconfdir} and "apt". But
${sysconfdir} is an absolute dir and that let ${D} be discarded.

The following is the help on function os.path.join(a, *p):
     Join two or more pathname components, inserting '/' as needed.
     If any component is an absolute path, all previous path components
     will be discarded.
Use oe.path.join instead which don't have this problem.

2. Create apt.conf.sample if it doesn't exist.

[YOCTO #3677]

(From OE-Core rev: 95a655a853b7cd43163362d72da0c134d4c0ec85)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia 2013-01-10 15:58:10 +08:00 committed by Richard Purdie
parent 60de86fc55
commit 78e5426a76
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta/recipes-devtools/apt/apt-native.inc
View File

@ -14,17 +14,18 @@ python do_install () {
python do_install_config () {
indir = os.path.dirname(d.getVar('FILE',1))
infile = file(os.path.join(indir, 'files', 'apt.conf'), 'r')
infile = file(oe.path.join(indir, 'files', 'apt.conf'), 'r')
data = infile.read()
infile.close()
data = d.expand(data)
outdir = os.path.join(d.getVar('D', True), d.getVar('sysconfdir', True), 'apt')
outdir = oe.path.join(d.getVar('D', True), d.getVar('sysconfdir', True), 'apt')
if not os.path.exists(outdir):
os.makedirs(outdir)
outpath = os.path.join(outdir, 'apt.conf.sample')
outpath = oe.path.join(outdir, 'apt.conf.sample')
if not os.path.exists(outpath):
outfile = file(outpath, 'w')
outfile.write(data)
outfile.close()