diff options
| author | Junichi Uekawa <dancer@netfort.gr.jp> | 2012-03-09 08:14:19 +0900 |
|---|---|---|
| committer | Junichi Uekawa <dancer@netfort.gr.jp> | 2012-03-09 08:14:19 +0900 |
| commit | 7aa69397d99fff86196c3a835551f099e4603057 (patch) | |
| tree | 0ea32320ac6f569b2a1c6dec6a9b6aa86acdf46e /pbuilder-createbuildenv | |
| parent | 78747b5f1081e3afa1d5e0147c4efdbd833b7d14 (diff) | |
| download | pbuilder-7aa69397d99fff86196c3a835551f099e4603057.tar pbuilder-7aa69397d99fff86196c3a835551f099e4603057.tar.gz | |
make longer lines wrap so reading patch files aren't as painful.
Diffstat (limited to 'pbuilder-createbuildenv')
| -rwxr-xr-x | pbuilder-createbuildenv | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index b23c343..e17307c 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -65,7 +65,14 @@ fi # FIXME if the end-user passes another --include= to debootstrap in # DEBOOTSTRAPOPTS, it will override the --include=apt one and apt might not be # installed -if ! ( cd "$BUILDPLACE" && "${DEBOOTSTRAP}" ${ARCHITECTURE:+--arch=$ARCHITECTURE} --include=apt "${DEBOOTSTRAPOPTS[@]}" "$DISTRIBUTION" . "$MIRRORSITE" $DEBOOTSTRAPSCRIPT ) ; then +if ! ( cd "$BUILDPLACE" && \ + "${DEBOOTSTRAP}" ${ARCHITECTURE:+--arch=$ARCHITECTURE} \ + --include=apt \ + "${DEBOOTSTRAPOPTS[@]}" \ + "$DISTRIBUTION" \ + . \ + "$MIRRORSITE" \ + $DEBOOTSTRAPSCRIPT ) ; then log "E: $DEBOOTSTRAP failed" exit 1 fi @@ -116,7 +123,10 @@ if [ -n "$REMOVEPACKAGES" ]; then fi recover_aptcache $CHROOTEXEC /usr/bin/apt-get -q -y "${APTGETOPT[@]}" "${FORCE_CONFNEW[@]}" dist-upgrade -$CHROOTEXEC /usr/bin/apt-get -q -y "${APTGETOPT[@]}" install build-essential dpkg-dev $EXTRAPACKAGES +$CHROOTEXEC /usr/bin/apt-get -q -y "${APTGETOPT[@]}" install \ + build-essential \ + dpkg-dev \ + $EXTRAPACKAGES save_aptcache executehooks "E" |