Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-18 04:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbuilder-dist: Store build logs in <source>_<version>_<arch>.build instead of last_operation.log

Browse Source 
This avoids overwriting build logs.
This commit is contained in:
Benjamin Drung 2014-04-15 13:06:55 +02:00
parent d850fc8cab
commit fbf0dcb259
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -12,6 +12,8 @@ ubuntu-dev-tools (0.153) UNRELEASED; urgency=medium
[ Benjamin Drung ] [ Benjamin Drung ]
* pbuilder-dist: * pbuilder-dist:
- Set different aptcache directories for Debian and Ubuntu. - Set different aptcache directories for Debian and Ubuntu.
- Store build logs in <source>_<version>_<arch>.build instead of
last_operation.log (to avoid overwriting build logs).
-- Stefano Rivera <stefanor@debian.org> Tue, 25 Feb 2014 22:45:05 +0200 -- Stefano Rivera <stefanor@debian.org> Tue, 25 Feb 2014 22:45:05 +0200

24
pbuilder-dist
View File

@ -32,9 +32,11 @@
import os import os
import sys import sys
import debian.deb822
from distro_info import DebianDistroInfo, UbuntuDistroInfo, DistroDataOutdated from distro_info import DebianDistroInfo, UbuntuDistroInfo, DistroDataOutdated
import ubuntutools.misc import ubuntutools.misc
import ubuntutools.version
from ubuntutools.config import UDTConfig from ubuntutools.config import UDTConfig
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
from ubuntutools.question import YesNoQuestion from ubuntutools.question import YesNoQuestion
@ -196,15 +198,25 @@ class PbuilderDist(object):
prefix = os.path.join(self.base, self.chroot_string) prefix = os.path.join(self.base, self.chroot_string)
if '--buildresult' not in remaining_arguments: if '--buildresult' not in remaining_arguments:
result = '%s_result/' % prefix result = os.path.normpath('%s_result/' % prefix)
else: else:
location_of_arg = remaining_arguments.index('--buildresult') location_of_arg = remaining_arguments.index('--buildresult')
result = remaining_arguments[location_of_arg+1] result = os.path.normpath(remaining_arguments[location_of_arg+1])
remaining_arguments.pop(location_of_arg+1) remaining_arguments.pop(location_of_arg+1)
remaining_arguments.pop(location_of_arg) remaining_arguments.pop(location_of_arg)
if not self.logfile and self.operation != 'login': if not self.logfile and self.operation != 'login':
self.logfile = os.path.normpath('%s/last_operation.log' % result) if self.operation == 'build':
dsc_files = [a for a in remaining_arguments
if a.strip().endswith('.dsc')]
assert len(dsc_files) == 1
dsc = debian.deb822.Dsc(open(dsc_files[0]))
version = ubuntutools.version.Version(dsc['Version'])
name = (dsc['Source'] + '_' + version.strip_epoch() + '_' +
self.build_architecture + '.build')
self.logfile = os.path.join(result, name)
else:
self.logfile = os.path.join(result, 'last_operation.log')
if not os.path.isdir(result): if not os.path.isdir(result):
try: try:
@ -471,8 +483,10 @@ def main():
# Parse the operation # Parse the operation
args = app.set_operation(args.pop(0)) + args args = app.set_operation(args.pop(0)) + args
if app.operation == 'build' and '.dsc' not in ' '.join(args): if app.operation == 'build':
Logger.error('You have to specify a .dsc file if you want to build.') if len([a for a in args if a.strip().endswith('.dsc')]) != 1:
msg = 'You have to specify one .dsc file if you want to build.'
Logger.error(msg)
sys.exit(1) sys.exit(1)
# Execute the pbuilder command # Execute the pbuilder command