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

monkeypatching doesn't work right; extend Launchpad.login instead

Browse Source
This commit is contained in:
Colin Watson 2011-08-16 16:20:29 +01:00
parent e6bde18b04
commit e8b02a39b2
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
syncpackage
View File

@ -35,7 +35,7 @@ from ubuntutools.config import UDTConfig, ubu_email
from ubuntutools.requestsync.mail import (getDebianSrcPkg from ubuntutools.requestsync.mail import (getDebianSrcPkg
as requestsync_mail_getDebianSrcPkg) as requestsync_mail_getDebianSrcPkg)
from ubuntutools.requestsync.lp import getDebianSrcPkg, getUbuntuSrcPkg from ubuntutools.requestsync.lp import getDebianSrcPkg, getUbuntuSrcPkg
from ubuntutools.lp import udtexceptions, api_version from ubuntutools.lp import udtexceptions
from ubuntutools.lp.lpapicache import Distribution, Launchpad from ubuntutools.lp.lpapicache import Distribution, Launchpad
from ubuntutools.misc import split_release_pocket from ubuntutools.misc import split_release_pocket
from ubuntutools import subprocess from ubuntutools import subprocess
@ -450,14 +450,11 @@ def main():
if args[0].endswith('.dsc'): if args[0].endswith('.dsc'):
parser.error('.dsc files can only be synced using --no-lp.') parser.error('.dsc files can only be synced using --no-lp.')
# We need devel for now.
api_version = 'devel'
if options.lpinstance is None: if options.lpinstance is None:
options.lpinstance = config.get_value('LPINSTANCE') options.lpinstance = config.get_value('LPINSTANCE')
try: try:
Launchpad.login(service=options.lpinstance) Launchpad.login(service=options.lpinstance, api_version='devel')
except IOError: except IOError:
sys.exit(1) sys.exit(1)

2
ubuntutools/lp/lpapicache.py
View File

@ -53,7 +53,7 @@ _POCKETS = ('Release', 'Security', 'Updates', 'Proposed', 'Backports')
class _Launchpad(object): class _Launchpad(object):
'''Singleton for LP API access.''' '''Singleton for LP API access.'''
def login(self, service=service): def login(self, service=service, api_version=api_version):
'''Enforce a non-anonymous login.''' '''Enforce a non-anonymous login.'''
if not self.logged_in: if not self.logged_in:
try: try: