aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2006-04-01 02:36:00 +0000
committerdancer <dancer>2006-04-01 02:36:00 +0000
commit2956aa2efc9e8ce7ce0c0da76619e83a5a0f53dc (patch)
tree3481ca676eb100ef6e19c6858b4df1cf54c4462f
parent67d689450c65a606c7018bf6e8691d176329a55b (diff)
downloadpbuilder-2956aa2efc9e8ce7ce0c0da76619e83a5a0f53dc.tar
pbuilder-2956aa2efc9e8ce7ce0c0da76619e83a5a0f53dc.tar.gz
pdebuild --help works without ./debian dir.
-rw-r--r--ChangeLog6
-rw-r--r--debian/changelog7
-rw-r--r--pdebuild6
3 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c1e755f..bfcde00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-01 Junichi Uekawa <dancer@debian.org>
+
+ * pdebuild: directory is moved after command-line is parsed.
+ This should fix a few weird behaviors wrt relative directories, and
+ allow --help to work if there is no debian/ directory
+
2006-03-31 Junichi Uekawa <dancer@debian.org>
* pbuilder-satisfydepends: spelling mistake, thanks pryzbyj for
diff --git a/debian/changelog b/debian/changelog
index 860612f..2c114fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
pbuilder (0.151) UNRELEASED; urgency=low
[Junichi Uekawa]
- * spelling fix
+ * minor spelling fixes.
+ * Bug fix: "pdebuild --help does not work on a place
+ that doesn't have debian/ dir", thanks to Nelson A. de Oliveira
+ (Closes: #359347).
- -- Junichi Uekawa <dancer@debian.org> Wed, 22 Mar 2006 07:14:50 +0900
+ -- Junichi Uekawa <dancer@debian.org> Sat, 1 Apr 2006 11:18:18 +0900
pbuilder (0.150) unstable; urgency=low
diff --git a/pdebuild b/pdebuild
index 69e3757..e541835 100644
--- a/pdebuild
+++ b/pdebuild
@@ -17,6 +17,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
set -e
+export PBCURRENTCOMMANDLINEOPERATION="pdebuild"
+. /usr/lib/pbuilder/pdebuild-checkparams
+
while ! test -d ./debian -o "$(pwd)" = "/" ; do
cd ..;
done
@@ -26,9 +29,6 @@ if test ! -d ./debian; then
exit 1
fi;
-export PBCURRENTCOMMANDLINEOPERATION="pdebuild"
-. /usr/lib/pbuilder/pdebuild-checkparams
-
PKG_SOURCENAME=$(dpkg-parsechangelog|sed -n 's/^Source: //p')
PKG_VERSION=$(dpkg-parsechangelog|sed -n 's/^Version: \(.*:\|\)//p')
ARCHITECTURE=$(dpkg-architecture -qDEB_HOST_ARCH)