diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-11 17:33:43 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-19 10:24:50 +0100 |
commit | bfd279de3275abbfaf3e630383ec244131e0375f (patch) | |
tree | 0d1c90461a890d21444f5d2afb13c52b302427f1 /meta/recipes-core/base-passwd | |
parent | 99203edda6f0b09d817454d656c100b7a8806b18 (diff) | |
download | poky-bfd279de3275abbfaf3e630383ec244131e0375f.tar.gz |
Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/base-passwd')
-rw-r--r-- | meta/recipes-core/base-passwd/base-passwd_3.5.24.bb | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb index 6eeee5cd5b..0d6f580f51 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.24.bb | |||
@@ -52,30 +52,30 @@ base_passwd_sstate_postinst() { | |||
52 | } | 52 | } |
53 | 53 | ||
54 | python populate_packages_prepend() { | 54 | python populate_packages_prepend() { |
55 | # Add in the preinst function for ${PN} | 55 | # Add in the preinst function for ${PN} |
56 | # We have to do this here as prior to this, passwd/group.master | 56 | # We have to do this here as prior to this, passwd/group.master |
57 | # would be unavailable. We need to create these files at preinst | 57 | # would be unavailable. We need to create these files at preinst |
58 | # time before the files from the package may be available, hence | 58 | # time before the files from the package may be available, hence |
59 | # storing the data from the files in the preinst directly. | 59 | # storing the data from the files in the preinst directly. |
60 | 60 | ||
61 | f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') | 61 | f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') |
62 | passwd = "".join(f.readlines()) | 62 | passwd = "".join(f.readlines()) |
63 | f.close() | 63 | f.close() |
64 | f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') | 64 | f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') |
65 | group = "".join(f.readlines()) | 65 | group = "".join(f.readlines()) |
66 | f.close() | 66 | f.close() |
67 | 67 | ||
68 | preinst = """#!/bin/sh | 68 | preinst = """#!/bin/sh |
69 | if [ ! -e $D${sysconfdir}/passwd ]; then | 69 | if [ ! -e $D${sysconfdir}/passwd ]; then |
70 | cat << EOF > $D${sysconfdir}/passwd | 70 | \tcat << EOF > $D${sysconfdir}/passwd |
71 | """ + passwd + """EOF | 71 | """ + passwd + """EOF |
72 | fi | 72 | fi |
73 | if [ ! -e $D${sysconfdir}/group ]; then | 73 | if [ ! -e $D${sysconfdir}/group ]; then |
74 | cat << EOF > $D${sysconfdir}/group | 74 | \tcat << EOF > $D${sysconfdir}/group |
75 | """ + group + """EOF | 75 | """ + group + """EOF |
76 | fi | 76 | fi |
77 | """ | 77 | """ |
78 | d.setVar('pkg_preinst_${PN}', preinst) | 78 | d.setVar('pkg_preinst_${PN}', preinst) |
79 | } | 79 | } |
80 | 80 | ||
81 | addtask do_package after do_populate_sysroot | 81 | addtask do_package after do_populate_sysroot |