aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2005-06-12 08:39:01 +0000
committerdancer <dancer>2005-06-12 08:39:01 +0000
commitb4f49d09738996e94d92bcb9b8cf6b17488c2415 (patch)
treea75697e526fea7a57abd648c146b6dd7ee6a4a0c
parent7d933cdeca8c02cadddb830d149ee80cd2b59372 (diff)
downloadpbuilder-b4f49d09738996e94d92bcb9b8cf6b17488c2415.tar
pbuilder-b4f49d09738996e94d92bcb9b8cf6b17488c2415.tar.gz
+2005-06-12 Junichi Uekawa <dancer@debian.org>
+ + * testsuite/test-pdebuild.sh: add a sample command-line that should + work. + + * pbuilder-modules (pbuilder-options): + find '-xdev' is an option, not an evaluation, and so moved it around + since newer find now complains. + Marc Dequènes (Duck) <Duck@DuckCorp.org> and "Artur R. Czechowski" <arturcz@hell.pl> + #312913 +
-rw-r--r--ChangeLog11
-rw-r--r--debian/changelog3
-rw-r--r--pbuilder-modules4
-rw-r--r--testsuite/test-pdebuild.sh2
4 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2222508..0c7ac74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-06-12 Junichi Uekawa <dancer@debian.org>
+
+ * testsuite/test-pdebuild.sh: add a sample command-line that should
+ work.
+
+ * pbuilder-modules (pbuilder-options):
+ find '-xdev' is an option, not an evaluation, and so moved it around
+ since newer find now complains.
+ Marc Dequènes (Duck) <Duck@DuckCorp.org> and "Artur R. Czechowski" <arturcz@hell.pl>
+ #312913
+
2005-06-08 Junichi Uekawa <dancer@debian.org>
* pbuildd/install-test.sh: imported from pbuilder-buildd tree.
diff --git a/debian/changelog b/debian/changelog
index da6f596..c7f7a6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ pbuilder (0.128) UNRELEASED; urgency=low
Bug fix: "pbuilder: pdebuild does not warn about --basetgz or
--distribution", thanks to Matt Kraai (Closes: #305944).
* man pages fixup: add \% for non-hyphenation (closes: #310656)
+ * Fix find options -xdev location. (closes: #312913)
- -- Junichi Uekawa <dancer@debian.org> Sun, 5 Jun 2005 18:12:18 +0900
+ -- Junichi Uekawa <dancer@debian.org> Sun, 12 Jun 2005 17:32:04 +0900
pbuilder (0.127) unstable; urgency=low
diff --git a/pbuilder-modules b/pbuilder-modules
index 0993fb7..2def2e9 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -185,8 +185,8 @@ function clean_subdirectories () {
return;
fi
echo " -> removing directory $1 and its subdirectories"
- find "$1" \( \! -type d \) -a -xdev -print0 |xargs -0 rm -f
- find "$1" -type d -xdev -depth -print0 | \
+ find "$1" -xdev \( \! -type d \) -print0 |xargs -0 rm -f
+ find "$1" -xdev -depth -type d -print0 | \
(xargs -0 rmdir || true)
}
diff --git a/testsuite/test-pdebuild.sh b/testsuite/test-pdebuild.sh
new file mode 100644
index 0000000..953ccc0
--- /dev/null
+++ b/testsuite/test-pdebuild.sh
@@ -0,0 +1,2 @@
+# try this ?
+pdebuild --configfile ~/.pbuilderrc --buildsourceroot fakeroot --pbuilderroot sudo --buildresult /var/tmp/test-results --auto-debsign $* \ No newline at end of file