diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-05-08 14:36:08 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-05-08 14:36:08 +0300 |
| commit | c9b6fc7e2d3d7395346acf3e3092d22474d82d55 (patch) | |
| tree | 10e986448efd663331884e4410d0acfae9b0b7fd /build | |
| parent | c5696f60193c31d98f1e313145b3611de3d34906 (diff) | |
| download | rpm-c9b6fc7e2d3d7395346acf3e3092d22474d82d55.tar.gz rpm-c9b6fc7e2d3d7395346acf3e3092d22474d82d55.tar.bz2 rpm-c9b6fc7e2d3d7395346acf3e3092d22474d82d55.zip | |
Don't run fixowner and fixgroup at end of %prep
- they'd only work for root, and we don't want to encourage people to build
as root...
Diffstat (limited to 'build')
| -rw-r--r-- | build/parsePrep.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/build/parsePrep.c b/build/parsePrep.c index 04b3b4962..306fae830 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -363,20 +363,14 @@ static int doSetupMacro(rpmSpec spec, const char *line) appendStringBuf(spec->prep, getStringBuf(after)); after = freeStringBuf(after); - /* XXX FIXME: owner & group fixes were conditioned on !geteuid() */ - /* Fix the owner, group, and permissions of the setup build tree */ - { static const char * const fixmacs[] = - { "%{_fixowner}", "%{_fixgroup}", "%{_fixperms}", NULL }; - const char * const * fm; - - for (fm = fixmacs; *fm; fm++) { - char * fix = rpmExpand(*fm, " .", NULL); - if (fix && *fix != '%') - appendLineStringBuf(spec->prep, fix); - fix = _free(fix); + /* Fix the permissions of the setup build tree */ + { char *fix = rpmExpand("%{_fixperms} .", NULL); + if (fix && *fix != '%') { + appendLineStringBuf(spec->prep, fix); } + free(fix); } - + return RPMRC_OK; } |