Merge lp:~javier.collado/utah/bug1050266 into lp:utah

Proposed by Javier Collado
Status: Merged
Merged at revision: 673
Proposed branch: lp:~javier.collado/utah/bug1050266
Merge into: lp:utah
Diff against target: 35 lines (+7/-5)
1 file modified
debian/control (+7/-5)
To merge this branch: bzr merge lp:~javier.collado/utah/bug1050266
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Review via email: mp+124164@code.launchpad.net

Description of the change

This branch moves git from Depends to Recommends

Finally bzr hasn't been moved, since it's used in utah.url to make it possible to get files from bzr branches. Ideally only python-bzrlib should be needed, but I found after a couple of tests that bzr is really needed to use the export command.

If bzr dependency is a problem, the code in utah.url could be refactored to capture import error exception and ignore launchpad URLs if the library isn't found. However, I don't think we should go that far for this bug unless this turns out to be a real problem in the future.

Note: This branch has been on created on top of lp:~javier.collado/utah/bug1050262 to avoid merge conflicts later. However, this means that it should be merged only after that branch.

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

This makes sense too. No need to install git if we don't need it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2012-08-14 16:55:16 +0000
3+++ debian/control 2012-09-13 11:38:24 +0000
4@@ -3,7 +3,7 @@
5 X-Python-Version: >= 2.5
6 Priority: optional
7 Maintainer: Max Brustkern <max@canonical.com>
8-Build-Depends: debhelper (>= 7.0.50~), python-all, devscripts
9+Build-Depends: debhelper (>= 7.0.50~), devscripts, python-all
10 Standards-Version: 3.9.3
11 Homepage: https://code.launchpad.net/utah
12 Vcs-Bzr: https://code.launchpad.net/utah
13@@ -11,9 +11,9 @@
14 Package: utah
15 Architecture: all
16 Depends: ${misc:Depends}, ${python:Depends},
17- bzr, bsdtar, git, libvirt-bin, lzma,
18- python-apt, python-libvirt, python-jsonschema,
19- python-netifaces, python-paramiko, python-psutil, python-yaml,
20+ bsdtar, libvirt-bin, lzma,
21+ python-apt, python-libvirt,
22+ python-netifaces, python-paramiko, python-psutil,
23 utah-client (=${binary:Version})
24 Recommends: kvm, vm-tools
25 Description: Ubuntu Test Automation Harness
26@@ -21,6 +21,8 @@
27
28 Package: utah-client
29 Architecture: all
30-Depends: ${misc:Depends}, ${python:Depends}, python-jsonschema, python-yaml, bzr, git
31+Depends: ${misc:Depends}, ${python:Depends},
32+ bzr, python-jsonschema (>= 0.5~), python-yaml
33+Recommends: git
34 Description: Ubuntu Test Automation Harness Client
35 Automation framework for testing in Ubuntu, client portion

Subscribers

People subscribed via source and target branches