diff options
| -rw-r--r-- | debian/TODO | 10 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | pbuilder-modules | 14 | ||||
| -rw-r--r-- | pbuilder.1 | 2 | ||||
| -rw-r--r-- | pbuilderrc.5 | 3 |
5 files changed, 26 insertions, 10 deletions
diff --git a/debian/TODO b/debian/TODO index 1549dde..946a367 100644 --- a/debian/TODO +++ b/debian/TODO @@ -1,11 +1,13 @@ TODO and possible bugs: - * Make pbuilder build to abort on error, and give back an errorcode. - * Build dependency handles |, but not when [] and | exist. -- no package should be using it. + * Build dependency handles |, but not when [] and | exist. -- no + package should be using it ? * Machine type specification in Build dependency should either have [!xxx !xxx !xxx ...] or [xxx xxx xxx ...] [!xxx xxx] formats are not parsed, and should really not exist. - * Now parses the .dsc file, however, the format of .dsc file is not really documented anywhere? - * Parse the .changes file instead of guessing the resultant objects ... ? (the content of file probably changes depending on the version... not a good idea. + * cooperate with sbuild, and use sbuild if possible. + * Please file a bug if you find that pbuilder does not exit with + error condition on failure to build a package. + * Remember to update the TODO file. $Id$ diff --git a/debian/changelog b/debian/changelog index b1e0738..647f362 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,13 @@ pbuilder (0.12) unstable; urgency=low Build-Depends line or Build-Conflicts line (closes: #120718) However, I don't think the policy really permits this very clearly. There are packages which exist doing this, and other tools do support this. + * fixed pbuilder.1, and pbuilderrc.5 so that it can be processed + correctly by WoMan. (removed some .PP) + and fixed some awkwardness in text. + * Added some error checking to pbuilder-buildpackage to give more + information when base.tgz has not been created (yet). - -- Junichi Uekawa <dancer@debian.org> Sat, 24 Nov 2001 13:27:43 +0900 + -- Junichi Uekawa <dancer@debian.org> Sun, 25 Nov 2001 13:28:01 +0900 pbuilder (0.11) unstable; urgency=low diff --git a/pbuilder-modules b/pbuilder-modules index a19c565..d090cbd 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -122,8 +122,18 @@ function extractbuildplace () { cleanbuildplace echo "building the build env" echo " -> extracting base.tgz" - mkdir -p "$BUILDPLACE" - (cd "$BUILDPLACE" && tar xfzp "$BASETGZ") + if ! mkdir -p "$BUILDPLACE"; then + echo "E: failed to build the directory to chroot" + exit 1 + fi + if [ ! -f "$BASETGZ" ]; then + echo "E: failed to find $BASETGZ, have you done <pbuilder create> to create your base tarball yet?" + exit 1 + fi + if ! (cd "$BUILDPLACE" && tar xfzp "$BASETGZ"); then + echo "E: failed to extract $BASETGZ to $BUILDPLACE" + exit 1 + fi mountproc mkdir -p "$BUILDPLACE/tmp/buildd" echo " -> copying local configuration" @@ -153,7 +153,7 @@ does not invoke the hooks if is empty, so if you want to avoid running hooks, run pbuilder with .B "--hookdir """"" -.PP + If there is a distribution hook, for example, if there was a file .B "sid" diff --git a/pbuilderrc.5 b/pbuilderrc.5 index ffca64f..b04c11d 100644 --- a/pbuilderrc.5 +++ b/pbuilderrc.5 @@ -42,8 +42,7 @@ on NFS shared beowulf clusters. Change it to something like .I "/var/cache/pbuilder/build/$HOSTNAME/" when doing such a thing. -.PP -Also + .B "pbuilder clean" cleans up this directory. .TP |