Author: jamessan Date: 2009-11-28 21:05:54 +0000 (Sat, 28 Nov 2009) New Revision: 2042
Modified: trunk/debian/changelog trunk/scripts/debrelease.sh Log: debrelease: Do not use .svn/deb-layout to determine debsdir if --debs-dir was used. (Closes: #558172) Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2009-11-22 17:51:24 UTC (rev 2041) +++ trunk/debian/changelog 2009-11-28 21:05:54 UTC (rev 2042) @@ -1,3 +1,10 @@ +devscripts (2.10.59) UNRELEASED; urgency=low + + * debrelease: Do not use .svn/deb-layout to determine debsdir if --debs-dir + was used. (Closes: #558172) + + -- James Vega <[email protected]> Sat, 28 Nov 2009 16:04:37 -0500 + devscripts (2.10.58) unstable; urgency=low * who-uploads: Correct the argument to wget's -O option. Thanks to Modified: trunk/scripts/debrelease.sh =================================================================== --- trunk/scripts/debrelease.sh 2009-11-22 17:51:24 UTC (rev 2041) +++ trunk/scripts/debrelease.sh 2009-11-28 21:05:54 UTC (rev 2042) @@ -239,9 +239,11 @@ # Use svn-buildpackage's directory if there is one and debsdir wasn't already # specified on the command-line. This can override DEBRELEASE_DEBS_DIR. -if [ -e ".svn/deb-layout" ]; then +if [ -n "$opt_debsdir" ]; then + debsdir="$opt_debsdir" +elif [ -e ".svn/deb-layout" ]; then buildArea="$(sed -ne '/^buildArea=/{s/^buildArea=//; s%/\+%/%g; s%\(.\)/$%\1%; p; q}' .svn/deb-layout)" - if [ -n "$buildArea" -a -d "$buildArea" -a -z "$opt_debsdir" ]; then + if [ -n "$buildArea" -a -d "$buildArea" ]; then debsdir="$buildArea" fi fi -- To unsubscribe, send mail to [email protected].
