diff options
| author | Junichi Uekawa <dancer@dancer64.netfort.gr.jp> | 2007-03-31 23:33:56 +0900 |
|---|---|---|
| committer | Junichi Uekawa <dancer@dancer64.netfort.gr.jp> | 2007-03-31 23:33:56 +0900 |
| commit | 53d1ee22f55f0c8f5347f1ef400bf275afee65a6 (patch) | |
| tree | 28e8bdf02a90676b801ccc02184d945e00363a97 | |
| parent | 0376f84ae920f0060afb52a02a79db6ca04cef09 (diff) | |
| download | pbuilder-53d1ee22f55f0c8f5347f1ef400bf275afee65a6.tar pbuilder-53d1ee22f55f0c8f5347f1ef400bf275afee65a6.tar.gz | |
391915: re-fix the applied patch, etc/$a inside buildplace was unconditionally removed.
"The fix for #391915 as applied in 0.165 isn't quite correct,
it still has an unconditional rm -f "$BUILDPLACE/etc/$a" outside
the check for an existing /etc/$a to copy into its place."
From Paul TBBle Hampson <Paul.Hampson@Pobox.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | pbuilder-modules | 1 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2007-03-31 Junichi Uekawa <dancer@debian.org> + + * pbuilder-modules: re-refix. 391915 + "The fix for #391915 as applied in 0.165 isn't quite correct, + it still has an unconditional rm -f "$BUILDPLACE/etc/$a" outside + the check for an existing /etc/$a to copy into its place." + From Paul TBBle Hampson <Paul.Hampson@Pobox.com> + 2007-03-30 Junichi Uekawa <dancer@debian.org> * pbuilder-user-mode-linux : '-n "${PBUILDER_COW}"' is not a good diff --git a/debian/changelog b/debian/changelog index 8df1e06..0ddaa5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ pbuilder (0.166) UNRELEASED; urgency=low [ Junichi Uekawa ] - * + * Re-Bug fix: "pbuilder: pbuilder-uml should not overwrite network + configuration", thanks to Paul TBBle Hampson (Closes: #391915). - -- Junichi Uekawa <dancer@debian.org> Sat, 31 Mar 2007 23:27:32 +0900 + -- Junichi Uekawa <dancer@debian.org> Sat, 31 Mar 2007 23:32:42 +0900 pbuilder (0.165) unstable; urgency=low diff --git a/pbuilder-modules b/pbuilder-modules index dd135d8..c42de9b 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -328,7 +328,6 @@ EOF function copy_local_configuration () { echo " -> copying local configuration" for a in hosts hostname resolv.conf; do - rm -f "$BUILDPLACE/etc/$a" if [ -f "/etc/$a" ]; then rm -f "$BUILDPLACE/etc/$a" cp $( readlink -f "/etc/$a" ) "$BUILDPLACE/etc/$a"; |