lp:~kvalo/bzr-builder/bug-744087

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builder at revision 119

James Westby: Approve on 2011-03-28

Diff: 51 lines (+4/-20)

2 files modified

cmds.py (+3/-3)
ppa.py (+1/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #744087: bzr builder crashed with AttributeError in _do_with_cleanups(): 'cmd_dailydeb' object has no attribute 'package'

Medium

Fix Released

Link a bug report

Related blueprints

120. By Kalle Valo on 2011-03-28

Update to latest launchpadlib API

The API has changed recently:

http://<email address hidden>/msg01653.html

Update the lp credential handling to use the new API.

Fixes this error:

bzr: ERROR: exceptions.TypeError: __init__() takes at least 4 arguments (3 given)

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 926, in excep
tion_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1126, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 691, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 713, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/kvalo/.bazaar/plugins/builder/cmds.py", line 543, in run
    if not watch(owner, archive, package_name, base_branch.deb_version):
  File "/home/kvalo/.bazaar/plugins/builder/ppa.py", line 64, in watch
    launchpad = get_lp()
  File "/home/kvalo/.bazaar/plugins/builder/ppa.py", line 42, in get_lp
    launchpad = Launchpad(credentials, EDGE_SERVICE_ROOT)
TypeError: __init__() takes at least 4 arguments (3 given)

119. By Kalle Valo on 2011-03-28

Fix --watch-ppa option

For some reason watch command was called with incorrect parameters. First,
there is no variable self.package, instead use package_name. Secondly,
watch() wants to have owner and archive in separate parameters, change
target_from_dput() accordingly.

118. By Jelmer Vernooij on 2011-03-11

Merge support for merging unrelated branches.

117. By Jelmer Vernooij on 2011-03-02

Merge support for quilt exit code 2 as success.

116. By Jelmer Vernooij on 2011-02-27

merge support for forcing 3.0 quilt packages to native packages when the series file is empty.

115. By Jelmer Vernooij on 2011-01-29

Merge removal of plugins/builder symlink.

114. By Jelmer Vernooij on 2011-01-12

Merge support for python-debian backed onto native Version implementation rather than
apt_pkg's.

113. By Jelmer Vernooij on 2011-01-12

Merge support for using stacked branches if bzrlib is new enough.

112. By Jelmer Vernooij on 2011-01-12

Merge fix for compatibility with bzr >= 2.3b5.

111. By Jelmer Vernooij on 2010-12-07

Merge automatic force of native source formats.