From: Yousong Zhou Date: Thu, 6 Sep 2018 08:00:24 +0000 (+0000) Subject: scripts/ipkg-build: quash error messages when conffiles.resolved is empty X-Git-Tag: v18.06.2~155 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa3805f2b6d3c03eee94579d29cf2f0bca07ce04;p=oweals%2Fopenwrt.git scripts/ipkg-build: quash error messages when conffiles.resolved is empty When Package/xx/conffiles only contains directories that are empty at package time, conffiles.resolved will be missing and the following error messages will appear in the build log. /home/yousong/git-repo/openwrt/openwrt/scripts/ipkg-build -c -o 0 -g 0 /home/yousong/git-repo/openwrt/openwrt/build_dir/target-mips_24kc_musl/linux-malta_be/openvswitch-2.10.0/ipkg-mips_24kc/openvswitch-common /home/yousong/git-repo/openwrt/openwrt/bin/packages/mips_24kc/packages mv: cannot stat 'CONTROL/conffiles.resolved': No such file or directory chmod: cannot access 'CONTROL/conffiles': No such file or directory It will not break the ipkg-build process. The change is merely cosmetic to not cause confusion when reading logs Signed-off-by: Yousong Zhou (backported from 9e58c20ec9d48ee41a4a306b0cd6d3aece285efd) --- diff --git a/scripts/ipkg-build b/scripts/ipkg-build index d38ba20af3..21127f3391 100755 --- a/scripts/ipkg-build +++ b/scripts/ipkg-build @@ -64,8 +64,10 @@ pkg_appears_sane() { done rm $CONTROL/conffiles - mv $CONTROL/conffiles.resolved $CONTROL/conffiles - chmod 0644 $CONTROL/conffiles + if [ -f $CONTROL/conffiles.resolved ]; then + mv $CONTROL/conffiles.resolved $CONTROL/conffiles + chmod 0644 $CONTROL/conffiles + fi fi cd $owd