diff options
| author | dancer <dancer> | 2001-12-25 15:24:27 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2001-12-25 15:24:27 +0000 |
| commit | 96e26b737eb856cc7e73c661539ede96df0fb496 (patch) | |
| tree | 476bed42981fb89b5fe697f50ac5e68ab4fced58 | |
| parent | fb8aaff420d292ec092b52cba657c72aa5d2dbe0 (diff) | |
| download | pbuilder-96e26b737eb856cc7e73c661539ede96df0fb496.tar pbuilder-96e26b737eb856cc7e73c661539ede96df0fb496.tar.gz | |
fixed a typo, and reordered apt source generation
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | pbuilder-modules | 8 | ||||
| -rw-r--r-- | pbuilder.1 | 9 |
3 files changed, 22 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 3c7973d..070afa8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +pbuilder (0.16) unstable; urgency=low + + * pbuilder-modules: Fixed a typo, which made it to create a broken + sources.list if MIRRORSITE was not specified. + * pbuilder-modules: Shuffled the orderings so that OTHERMIRROR takes the + priority. + + -- Junichi Uekawa <dancer@debian.org> Wed, 26 Dec 2001 00:12:25 +0900 + pbuilder (0.15) unstable; urgency=low * Added a little more heuristics to pdebuild, so that it is nicer to use... diff --git a/pbuilder-modules b/pbuilder-modules index 97dbc26..1208c2e 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -99,7 +99,10 @@ function installaptlines (){ echo "Distribution not specified, please specify" >&2 exit 1 fi - if [ -n "$BUILDPLACE" ] ; then + if [ -n "$OTHERMIRROR" ]; then + echo "$OTHERMIRROR" | tr "|" "\n" >> "$BUILDPLACE"/etc/apt/sources.list + fi + if [ -n "$MIRRORSITE" ] ; then cat >> "$BUILDPLACE"/etc/apt/sources.list << EOF deb $MIRRORSITE $DISTRIBUTION main contrib non-free deb-src $MIRRORSITE $DISTRIBUTION main contrib non-free @@ -111,9 +114,6 @@ deb $NONUSMIRRORSITE $DISTRIBUTION/non-US main contrib non-free deb-src $NONUSMIRRORSITE $DISTRIBUTION/non-US main contrib non-free EOF fi - if [ -n "$OTHERMIRROR" ]; then - echo "$OTHERMIRROR" | tr "|" "\n" >> "$BUILDPLACE"/etc/apt/sources.list - fi } @@ -87,6 +87,10 @@ update and build targets. The format is something like: .I "http://http.us.debian.org/debian" which should point to your favorite mirror. + +This option can optionally be omitted, and left blank, +in which case, this part is skipped. + .TP .BI "--nonusmirror [" "mirror location" "]" The non-US mirror, specified like the @@ -98,6 +102,11 @@ The lines which is added to the sources.list, delimited with .B "|" Like .B "deb http://local/mirror stable main|deb file:/usr/local/mirror ./" + +The deb lines here are the ones that will appear at the top of the +.B sources.list +inside the chroot. + .TP .BI "--http-proxy [" "proxy" "]" Specifies the http proxy url. Something like |