mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-16 01:21:07 +00:00
Merge again with Iain Lane's branch.
This commit is contained in:
commit
793e6d2004
@ -2,6 +2,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (C) 2007-2008 Siegfried-A. Gevatter <rainct@ubuntu.com>
|
# Copyright (C) 2007-2008 Siegfried-A. Gevatter <rainct@ubuntu.com>
|
||||||
|
# With some changes by Iain Lane <iain@orangesquash.org.uk>
|
||||||
# Based upon pbuilder-dist-simple by Jamin Collins and Jordan Mantha.
|
# Based upon pbuilder-dist-simple by Jamin Collins and Jordan Mantha.
|
||||||
#
|
#
|
||||||
# License: GPLv2 or later
|
# License: GPLv2 or later
|
||||||
@ -62,6 +63,9 @@ class pbuilder_dist:
|
|||||||
self.base = os.environ['PBUILDFOLDER']
|
self.base = os.environ['PBUILDFOLDER']
|
||||||
else:
|
else:
|
||||||
self.base = os.path.expanduser('~/pbuilder/')
|
self.base = os.path.expanduser('~/pbuilder/')
|
||||||
|
|
||||||
|
if not os.path.exists(self.base):
|
||||||
|
os.makedirs(self.base)
|
||||||
|
|
||||||
if 'PBUILDAUTH' in os.environ:
|
if 'PBUILDAUTH' in os.environ:
|
||||||
self.auth = os.environ['PBUILDAUTH']
|
self.auth = os.environ['PBUILDAUTH']
|
||||||
@ -115,7 +119,7 @@ class pbuilder_dist:
|
|||||||
self.chroot_string = '%(target_distro)s-%(build_architecture)s' % self
|
self.chroot_string = '%(target_distro)s-%(build_architecture)s' % self
|
||||||
|
|
||||||
if not self.logfile:
|
if not self.logfile:
|
||||||
self.logfile = '%(base)s/.%(chroot_string)s.log' % self
|
self.logfile = '%(base)s.%(chroot_string)s.log' % self
|
||||||
|
|
||||||
def set_target_distro(self, distro):
|
def set_target_distro(self, distro):
|
||||||
""" pbuilder_dist.set_target_distro(distro) -> None
|
""" pbuilder_dist.set_target_distro(distro) -> None
|
||||||
@ -172,9 +176,9 @@ class pbuilder_dist:
|
|||||||
|
|
||||||
arguments = [
|
arguments = [
|
||||||
self.operation,
|
self.operation,
|
||||||
'--basetgz "%(base)s/%(chroot_string)s-base.tgz"' % self,
|
'--basetgz "%(base)s%(chroot_string)s-base.tgz"' % self,
|
||||||
'--distribution "%(target_distro)s"' % self,
|
'--distribution "%(target_distro)s"' % self,
|
||||||
'--buildresult "%(base)s/%(chroot_string)s_result/"' % self,
|
'--buildresult "%(base)s%(chroot_string)s_result/"' % self,
|
||||||
'--logfile "%(logfile)s"' % self,
|
'--logfile "%(logfile)s"' % self,
|
||||||
'--aptcache "/var/cache/apt/archives/"',
|
'--aptcache "/var/cache/apt/archives/"',
|
||||||
### --mirror "${ARCHIVE}" \
|
### --mirror "${ARCHIVE}" \
|
||||||
@ -257,7 +261,7 @@ def main():
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
script_name = os.path.basename(__name__ or sys.argv[0])
|
script_name = os.path.basename(sys.argv[0])
|
||||||
parts = script_name.split('-')
|
parts = script_name.split('-')
|
||||||
|
|
||||||
# Copy arguments into another list for save manipulation
|
# Copy arguments into another list for save manipulation
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
# Steve Kowalik <stevenk@ubuntu.com>
|
# Steve Kowalik <stevenk@ubuntu.com>
|
||||||
# Michael Bienia <geser@ubuntu.com> (python-launchpad-bugs support)
|
# Michael Bienia <geser@ubuntu.com> (python-launchpad-bugs support)
|
||||||
# Daniel Hahler <ubuntu@thequod.de>
|
# Daniel Hahler <ubuntu@thequod.de>
|
||||||
|
# Iain Lane <iain@orangesquash.org.uk>
|
||||||
#
|
#
|
||||||
# License: GPLv2, see /usr/share/common-licenses/GPL-2
|
# License: GPLv2, see /usr/share/common-licenses/GPL-2
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user