cloud-init

Merge ~smoser/cloud-init:fix/read-dependencies-maintain-distro into cloud-init:master

  1. Git
  2. lp:~smoser/cloud-init
  3. fix/read-dependencies-maintain-distro
  4. Merge into master
Proposed by Scott Moser
Status: Merged
Approved by: Scott Moser
Approved revision: 449a7fc3b849ef9f1271161343f101edfc352fe2
Merge reported by: Scott Moser
Merged at revision: 32c485bdc6e1eee0ad1d92dcd633a4e7ac9ac7a6
Proposed branch: ~smoser/cloud-init:fix/read-dependencies-maintain-distro
Merge into: cloud-init:master
Diff against target: 28 lines (+3/-3)
1 file modified
packages/brpm (+3/-3)
Reviewer Review Type Date Requested Status
Ryan Harper Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+346747@code.launchpad.net

Commit message

packages/brpm: Get proper dependencies for cmdline distro.

When invoked with '--distro=suse', the packages that would be
attempted for installation would be from redhat. We just were not
pasing the args.distro through. That is fixed here.

Description of the change

see commit message

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:449a7fc3b849ef9f1271161343f101edfc352fe2
https://jenkins.ubuntu.com/server/job/cloud-init-ci/33/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/33/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) wrote :

Good fix;

review: Approve
Revision history for this message
Scott Moser (smoser) wrote :

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=32c485bd

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/packages/brpm b/packages/brpm
2index 3439cf3..a154ef2 100755
3--- a/packages/brpm
4+++ b/packages/brpm
5@@ -42,13 +42,13 @@ def run_helper(helper, args=None, strip=True):
6 return stdout
7
8
9-def read_dependencies(requirements_file='requirements.txt'):
10+def read_dependencies(distro, requirements_file='requirements.txt'):
11 """Returns the Python package depedencies from requirements.txt files.
12
13 @returns a tuple of (requirements, test_requirements)
14 """
15 pkg_deps = run_helper(
16- 'read-dependencies', args=['--distro', 'redhat']).splitlines()
17+ 'read-dependencies', args=['--distro', distro]).splitlines()
18 test_deps = run_helper(
19 'read-dependencies', args=[
20 '--requirements-file', 'test-requirements.txt',
21@@ -83,7 +83,7 @@ def generate_spec_contents(args, version_data, tmpl_fn, top_dir, arc_fn):
22 rpm_upstream_version = version_data['version']
23 subs['rpm_upstream_version'] = rpm_upstream_version
24
25- deps, test_deps = read_dependencies()
26+ deps, test_deps = read_dependencies(distro=args.distro)
27 subs['buildrequires'] = deps + test_deps
28 subs['requires'] = deps
29

Subscribers

People subscribed via source and target branches