Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge trunk

Browse Source
This commit is contained in:
Colin Watson 2011-08-16 16:41:23 +01:00
commit 7386ca4d0c
3 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
debian/changelog vendored
View File

@ -1,16 +1,22 @@
ubuntu-dev-tools (0.128) UNRELEASED; urgency=low ubuntu-dev-tools (0.129) UNRELEASED; urgency=low
* syncpackage: Convert to new LP API, with --no-lp available for the old
style of operation.
-- Colin Watson <cjwatson@ubuntu.com> Tue, 16 Aug 2011 16:40:22 +0100
ubuntu-dev-tools (0.128) unstable; urgency=low
[ Stefano Rivera ] [ Stefano Rivera ]
* ubuntutools.builder: Detect missing builder and fail early. * ubuntutools.builder: Detect missing builder and fail early.
* backportpackage: Backport from local source packages again (LP: #801945)
* ubuntutools.test.test_archive: Forgive newer python-debian's for calling
GpgInfo.from_sequence() with the optional keyrings arguments.
[ Julian Taylor ] [ Julian Taylor ]
* lp-shell: use ipython shell if available * lp-shell: use ipython shell if available
[ Colin Watson ] -- Stefano Rivera <stefanor@debian.org> Tue, 16 Aug 2011 11:15:18 +0200
* syncpackage: Convert to new LP API, with --no-lp available for the old
style of operation.
-- Julian Taylor <jtaylor.debian@googlemail.com> Sun, 14 Aug 2011 18:56:52 +0200
ubuntu-dev-tools (0.127) unstable; urgency=low ubuntu-dev-tools (0.127) unstable; urgency=low

7
ubuntutools/archive.py
View File

@ -101,7 +101,7 @@ class SourcePackage(object):
Use DebianSourcePackage or UbuntuSourcePackage instead of using this Use DebianSourcePackage or UbuntuSourcePackage instead of using this
directly. directly.
""" """
distribution = 'unknown' distribution = None
def __init__(self, package=None, version=None, component=None, def __init__(self, package=None, version=None, component=None,
dscfile=None, lp=None, mirrors=(), workdir='.'): dscfile=None, lp=None, mirrors=(), workdir='.'):
@ -124,8 +124,9 @@ class SourcePackage(object):
# Mirrors # Mirrors
self._dsc_source = dscfile self._dsc_source = dscfile
self.mirrors = list(mirrors) self.mirrors = list(mirrors)
self.masters = [UDTConfig.defaults['%s_MIRROR' if self.distribution:
% self.distribution.upper()]] self.masters = [UDTConfig.defaults['%s_MIRROR'
% self.distribution.upper()]]
if dscfile is not None: if dscfile is not None:
if self.source is None: if self.source is None:
self.source = 'unknown' self.source = 'unknown'

29
ubuntutools/test/test_archive.py
View File

@ -21,6 +21,7 @@ import os.path
import shutil import shutil
import StringIO import StringIO
import tempfile import tempfile
import types
import urllib2 import urllib2
import debian.deb822 import debian.deb822
@ -299,11 +300,17 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase):
self.mock_opener.open(mirror + base + 'example_1.0-1.debian.tar.gz' self.mock_opener.open(mirror + base + 'example_1.0-1.debian.tar.gz'
).WithSideEffects(self.urlopen_proxy) ).WithSideEffects(self.urlopen_proxy)
self.mox.StubOutWithMock(debian.deb822.GpgInfo, 'from_sequence') def fake_gpg_info(self, message, keyrings=None):
debian.deb822.GpgInfo.from_sequence(mox.IsA(str)).WithSideEffects( return debian.deb822.GpgInfo.from_output(
lambda x: debian.deb822.GpgInfo.from_output(
'[GNUPG:] GOODSIG DEADBEEF Joe Developer ' '[GNUPG:] GOODSIG DEADBEEF Joe Developer '
'<joe@example.net>')) '<joe@example.net>')
# We have to stub this out without mox because there some versions of
# python-debian will pass keyrings=None, others won't.
# http://code.google.com/p/pymox/issues/detail?id=37
self.mox.stubs.Set(debian.deb822.GpgInfo, 'from_sequence',
types.MethodType(fake_gpg_info,
debian.deb822.GpgInfo,
debian.deb822.GpgInfo))
self.mox.ReplayAll() self.mox.ReplayAll()
@ -323,10 +330,16 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase):
self.mock_opener.open(mirror + base + 'example_1.0-1.dsc' self.mock_opener.open(mirror + base + 'example_1.0-1.dsc'
).WithSideEffects(self.urlopen_proxy) ).WithSideEffects(self.urlopen_proxy)
self.mox.StubOutWithMock(debian.deb822.GpgInfo, 'from_sequence') def fake_gpg_info(self, message, keyrings=None):
debian.deb822.GpgInfo.from_sequence(mox.IsA(str)).WithSideEffects( return debian.deb822.GpgInfo.from_output(
lambda x: debian.deb822.GpgInfo.from_output( '[GNUPG:] ERRSIG DEADBEEF')
'[GNUPG:] ERRSIG DEADBEEF')) # We have to stub this out without mox because there some versions of
# python-debian will pass keyrings=None, others won't.
# http://code.google.com/p/pymox/issues/detail?id=37
self.mox.stubs.Set(debian.deb822.GpgInfo, 'from_sequence',
types.MethodType(fake_gpg_info,
debian.deb822.GpgInfo,
debian.deb822.GpgInfo))
self.mox.ReplayAll() self.mox.ReplayAll()