diff options
| -rw-r--r-- | meta/classes-global/package_rpm.bbclass | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 474d2491eb..ddc4bf3a6a 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass | |||
| @@ -201,14 +201,22 @@ python write_specfile () { | |||
| 201 | try: | 201 | try: |
| 202 | owner = pwd.getpwuid(stat_f.st_uid).pw_name | 202 | owner = pwd.getpwuid(stat_f.st_uid).pw_name |
| 203 | except Exception as e: | 203 | except Exception as e: |
| 204 | bb.error("Content of /etc/passwd in sysroot:\n{}".format( | 204 | filename = d.getVar('RECIPE_SYSROOT') + '/etc/passwd' |
| 205 | open(d.getVar("RECIPE_SYSROOT") +"/etc/passwd").read())) | 205 | if os.path.exists(filename): |
| 206 | bb.error("Content of /etc/passwd in sysroot:\n{}".format( | ||
| 207 | open(filename).read())) | ||
| 208 | else: | ||
| 209 | bb.error("File {} doesn't exist in sysroot!".format(filename)) | ||
| 206 | raise e | 210 | raise e |
| 207 | try: | 211 | try: |
| 208 | group = grp.getgrgid(stat_f.st_gid).gr_name | 212 | group = grp.getgrgid(stat_f.st_gid).gr_name |
| 209 | except Exception as e: | 213 | except Exception as e: |
| 210 | bb.error("Content of /etc/group in sysroot:\n{}".format( | 214 | filename = d.getVar("RECIPE_SYSROOT") +"/etc/group" |
| 211 | open(d.getVar("RECIPE_SYSROOT") +"/etc/group").read())) | 215 | if os.path.exists(filename): |
| 216 | bb.error("Content of /etc/group in sysroot:\n{}".format( | ||
| 217 | open(filename).read())) | ||
| 218 | else: | ||
| 219 | bb.error("File {} doesn't exists in sysroot!".format(filename)) | ||
| 212 | raise e | 220 | raise e |
| 213 | return "%attr({:o},{},{}) ".format(mode, owner, group) | 221 | return "%attr({:o},{},{}) ".format(mode, owner, group) |
| 214 | 222 | ||
