X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_movefiles;h=be46dcb3827dd026e3f102187ce174047e3ac6ce;hb=9b53dab3959087e387b73f0a573172fdc910e737;hp=6e3a8688195e146dd9842b39fda60c98126a0129;hpb=5c808f0c60445978cb180202a9f760032d24f742;p=debhelper.git diff --git a/dh_movefiles b/dh_movefiles index 6e3a868..be46dcb 100755 --- a/dh_movefiles +++ b/dh_movefiles @@ -43,7 +43,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) { # Now we need to expand wildcards in @tomove. # This is only necessary in pre-v3 land -- as of v3, the # expension is automatically done by filearray(). - if (@tomove && ! Debian::Debhelper::Dh_Lib::compat(3)) { + if (@tomove && Debian::Debhelper::Dh_Lib::compat(2)) { @filelist=(); foreach (@tomove) { push @filelist, glob("$sourcedir/$_"); @@ -59,7 +59,10 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) { doit("rm","-f","debian/movelist"); foreach (@tomove) { $file=$_; - $ret=1 if (! -e $file && ! -l $file); + if (! -e $file && ! -l $file) { + $ret=1; + warning("$file not found"); + } $file=~s:^\Q$sourcedir\E/+::; complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -print || true) >> debian/movelist"); }