diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2011-06-28 13:01:59 +0300 |
---|---|---|
committer | Panu Matilainen <Panu Matilainen pmatilai@redhat.com> | 2011-07-15 12:23:47 +0300 |
commit | bcd673bcdea7bf9ab80621d3d767866e7a232e8d (patch) | |
tree | 27aab6569adb26e9b9e79360d94e722e9e17d3b2 | |
parent | 24a78c130af62a2013fd4de0085e0e99fe386c47 (diff) | |
download | rpm-bcd673bcdea7bf9ab80621d3d767866e7a232e8d.tar.gz |
Fix explicit directory %attr() when %defattr() is active (RhBug:481875)
- parseForAttr() doesn't know whether it's dealing with a directory or
a file, so it can't know which defaults it should use.
Move all the decision making on which of the explicit/default/implicit
attributes into addFile() where we do know what kind of entry we're
dealing with, and only parse in parseForAttr().
- backported from commit 09efbe9656bed123dcfb240a7d94906b981a65d1
-rw-r--r-- | build/files.c | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/build/files.c b/build/files.c index 5ccd99c7a..b4b893a27 100644 --- a/build/files.c +++ b/build/files.c @@ -543,13 +543,7 @@ static rpmRC parseForAttr(char * buf, FileList fl) } ar->ar_fmode = ui; } else { - if (ret_ar == &(fl->def_ar)) { - ar->ar_fmodestr = NULL; - ar->ar_fmode = 0; - } else { - ar->ar_fmodestr = fl->def_ar.ar_fmodestr; - ar->ar_fmode = fl->def_ar.ar_fmode; - } + ar->ar_fmodestr = NULL; } if (ar->ar_dmodestr && !isAttrDefault(ar->ar_dmodestr)) { @@ -561,29 +555,15 @@ static rpmRC parseForAttr(char * buf, FileList fl) } ar->ar_dmode = ui; } else { - if (ret_ar == &(fl->def_ar)) { - ar->ar_dmodestr = NULL; - ar->ar_dmode = 0; - } else { - ar->ar_dmodestr = fl->def_ar.ar_dmodestr; - ar->ar_dmode = fl->def_ar.ar_dmode; - } + ar->ar_dmodestr = NULL; } if (!(ar->ar_user && !isAttrDefault(ar->ar_user))) { - if (ret_ar == &(fl->def_ar)) { - ar->ar_user = NULL; - } else { - ar->ar_user = fl->def_ar.ar_user; - } + ar->ar_user = NULL; } if (!(ar->ar_group && !isAttrDefault(ar->ar_group))) { - if (ret_ar == &(fl->def_ar)) { - ar->ar_group = NULL; - } else { - ar->ar_group = fl->def_ar.ar_group; - } + ar->ar_group = NULL; } dupAttrRec(ar, ret_ar); @@ -1423,20 +1403,33 @@ static rpmRC addFile(FileList fl, const char * diskPath, fileUid = statp->st_uid; fileGid = statp->st_gid; - if (S_ISDIR(fileMode) && fl->cur_ar.ar_dmodestr) { - fileMode &= S_IFMT; - fileMode |= fl->cur_ar.ar_dmode; - } else if (fl->cur_ar.ar_fmodestr != NULL) { + /* Explicit %attr() always wins */ + if (fl->cur_ar.ar_fmodestr != NULL) { fileMode &= S_IFMT; fileMode |= fl->cur_ar.ar_fmode; + } else { + /* ...but %defattr() for directories and files is different */ + if (S_ISDIR(fileMode)) { + if (fl->def_ar.ar_dmodestr) { + fileMode &= S_IFMT; + fileMode |= fl->def_ar.ar_dmode; + } + } else if (fl->def_ar.ar_fmodestr) { + fileMode &= S_IFMT; + fileMode |= fl->def_ar.ar_fmode; + } } if (fl->cur_ar.ar_user) { fileUname = fl->cur_ar.ar_user; + } else if (fl->def_ar.ar_user) { + fileUname = fl->def_ar.ar_user; } else { fileUname = rpmugUname(fileUid); } if (fl->cur_ar.ar_group) { fileGname = fl->cur_ar.ar_group; + } else if (fl->def_ar.ar_group) { + fileGname = fl->def_ar.ar_group; } else { fileGname = rpmugGname(fileGid); } @@ -1849,7 +1842,7 @@ static rpmRC processPackageFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags, fl.nLangs = 0; fl.currentCaps = NULL; - dupAttrRec(&fl.def_ar, &fl.cur_ar); + freeAttrRec(&fl.cur_ar); if (parseForVerify(buf, &fl)) continue; |