diff options
| author | Allan McRae <allan@archlinux.org> | 2012-12-16 13:32:54 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-01-03 03:03:10 +0100 |
| commit | 241d6b884a3a6c883b6c61a3b175d17e7d317fc5 (patch) | |
| tree | 0e45b5375174c4b1fceb5a00657875657fd4d793 /scripts/makepkg.sh.in | |
| parent | d5a6ce8ca124d1eea343314b23110e006eb313d5 (diff) | |
| download | pacman-241d6b884a3a6c883b6c61a3b175d17e7d317fc5.tar.gz pacman-241d6b884a3a6c883b6c61a3b175d17e7d317fc5.tar.xz | |
makepkg: use --apparent-size when du supports it
Amazingly, using "sleep 1" to convince btrfs to report correct file
sizes is only a 90% fix. Sometimes more sleep is needed.
Instead we use the --apparent-size argument to du to get actual file
sizes. This is used only on Linux as the various BSDs do not support
this argument.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/makepkg.sh.in')
| -rw-r--r-- | scripts/makepkg.sh.in | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ff3fa5b8..ceaab612 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1704,12 +1704,7 @@ write_pkginfo() { local packager="Unknown Packager" fi - # btrfs's delayed allocation causes the stat buffers from the kernel to "lie" - # to us momentarily and report 0 blocks allocated (which is how du calculates - # size). Sleeping for a second here is about the dirtiest thing possible, - # but avoids reporting entirely bogus install sizes. - sleep 1 - local size="$(@DUPATH@ -sk)" + local size="$(@DUPATH@ @DUFLAGS@)" size="$(( ${size%%[^0-9]*} * 1024 ))" msg2 "$(gettext "Generating %s file...")" ".PKGINFO" |