X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-update;h=5786aa5c0bf70901d2927b7becbff67dccf0cdce;hb=40d7f10b59743ed088c33c6b129373652ca9a59a;hp=0bac954fe6b84dad3cf8530edd88de02b9231de3;hpb=b9eb4486d50a2af606c6b776fcb5dfe065ccee9e;p=zpackage diff --git a/zpm-update b/zpm-update index 0bac954..5786aa5 100755 --- a/zpm-update +++ b/zpm-update @@ -292,7 +292,7 @@ for mergepkg in $merge; do # TODO check for symlinks? if [ $pkgfile != $ZPMDB ]; then echo merging $pkgfile $pkgid - zpm merge -Fuv -f "$pkgfile" $pkgid + zpm merge -Fu -f "$pkgfile" $pkgid if [ $? -ne 0 ]; then die "unable to merge $pkgfile" fi