cookutils rev 949
cook: specify we use busybox fold (don't fail when remove coreutils-file-format or coreutils-multicall containing fold); cooker: remove package from packages.info DB too.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Thu Jul 20 05:07:33 2017 +0300 (2017-07-20) |
parents | 1b74677e163f |
children | db84a0fdf6f4 |
files | cook cooker |
line diff
1.1 --- a/cook Mon Jul 17 09:42:35 2017 +0100 1.2 +++ b/cook Thu Jul 20 05:07:33 2017 +0300 1.3 @@ -534,7 +534,7 @@ 1.4 newline; newline 1.5 # Keep the last diff for debug and info. 1.6 mv -f $diff $CACHE/installed.diff 1.7 - } | fold -sw80 1.8 + } | busybox fold -sw80 1.9 } 1.10 1.11 1.12 @@ -1426,9 +1426,11 @@ 1.13 DEPENDS=$(echo $DEPENDS) # remove newlines, tabs and multiple spaces from variable 1.14 1.15 # Calculate release checksum: usually it does not change on "just recook". 1.16 - # Release checksum is md5sum of file containing md5sums of all files, receipts and description.txts. 1.17 + # Release checksum is md5sum of file containing md5sums of: 1.18 + # a) all files, b) receipt, and c) description.txt. 1.19 # Md5sum of the package file will change every time because of embedded timestamps; 1.20 # release checksum based only on files content, and will change only when files change. 1.21 + # (Pitfall: ownership and permissions...) 1.22 rsumf=$(mktemp) 1.23 cp $pack/md5sum $rsumf 1.24 md5sum $pack/receipt | sed 's| [^ ]*/| |' >> $rsumf
2.1 --- a/cooker Mon Jul 17 09:42:35 2017 +0100 2.2 +++ b/cooker Thu Jul 20 05:07:33 2017 +0300 2.3 @@ -604,6 +604,7 @@ 2.4 fi 2.5 rm -rf $wok/$pkg $LOGS/$pkg.log 2.6 sed -i "/^${pkg}$/d" $blocked $broken $commits.tmp 2.7 + sed -i "/^$pkg\t/d" $PKGS/packages.info 2.8 fi 2.9 if [ -d "$wok/$pkg/stuff" ]; then 2.10 if [ ! -d "$wok-hg/$pkg/stuff" ]; then