From 2c4db266b454a8d5fc59b2bd93e110edce7078d9 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 5 Nov 2009 14:18:29 +0000 Subject: [PATCH] Don't pass --logfile if logging in pbuilder-dist: Don't pass --logfile if we are trying to log in to the chrootthe logfile option swallows the prompt, and we probably don't want to log if we are using login anyway. --- debian/changelog | 5 ++++- pbuilder-dist | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 44e6dc7..d461e48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ ubuntu-dev-tools (0.82) UNRELEASED; urgency=low [ Iain Lane ] * debian/control: Re-add XS-Python-Version - this is more standard * debian/pyversions: Drop + * pbuilder-dist: Don't pass --logfile if we are trying to log in to the + chroot - the logfile option swallows the prompt, and we probably don't + want to log if we are using login anyway. [ Nathan Handler ] * debian/control: Mention lp-project-upload in Description @@ -31,7 +34,7 @@ ubuntu-dev-tools (0.82) UNRELEASED; urgency=low back to 'unstable' for lucid+1) * pull-debian-source: change default release to pull from to 'testing' - -- Michael Bienia Mon, 02 Nov 2009 19:23:15 +0100 + -- Iain Lane Thu, 05 Nov 2009 14:17:21 +0000 ubuntu-dev-tools (0.81) karmic; urgency=low diff --git a/pbuilder-dist b/pbuilder-dist index babc6ee..250d8ab 100755 --- a/pbuilder-dist +++ b/pbuilder-dist @@ -178,7 +178,7 @@ class pbuilder_dist: prefix = os.path.join(self.base, self.chroot_string) result = '%s_result/' % prefix - if not self.logfile: + if not self.logfile and self.operation != 'login': self.logfile = os.path.normpath('%s/last_operation.log' % result) if not os.path.isdir(result): @@ -198,11 +198,13 @@ class pbuilder_dist: base, '--distribution "%(target_distro)s"' % self, '--buildresult "%s"' % result, - '--logfile "%s"' % self.logfile, '--aptcache "/var/cache/apt/archives/"', ### --mirror "${ARCHIVE}" \ '--override-config', ] + + if self.logfile: + arguments.append('--logfile %s' % self.logfile) if os.path.exists('/var/cache/archive/'): arguments.append('--bindmounts "/var/cache/archive/"')