Juju Charm Tools

Merge lp:~johnsca/charm-tools/compose into lp:~bcsaller/charm-tools/composer

  1. compose
  2. Merge into composer
Proposed by Cory Johns
Status: Needs review
Proposed branch: lp:~johnsca/charm-tools/compose
Merge into: lp:~bcsaller/charm-tools/composer
Diff against target: 26 lines (+2/-4)
2 files modified
charmtools/compose/__init__.py (+1/-3)
charmtools/compose/tactics.py (+1/-1)
To merge this branch: bzr merge lp:~johnsca/charm-tools/compose
Reviewer Review Type Date Requested Status
Benjamin Saller Pending
Review via email: mp+268164@code.launchpad.net

Description of the change

More missing libs, and fixed --help (doc does not get included in install)

To post a comment you must log in.
lp:~johnsca/charm-tools/compose updated
366. By Cory Johns

Fixed compose name default when composing current dir

367. By Cory Johns

Fixed import in relation skeleton in composer

368. By Cory Johns

Merged upstream

Unmerged revisions

368. By Cory Johns

Merged upstream

367. By Cory Johns

Fixed import in relation skeleton in composer

366. By Cory Johns

Fixed compose name default when composing current dir

365. By Cory Johns

Added more missing libs for compose and fixed compose --help

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmtools/compose/__init__.py'
2--- charmtools/compose/__init__.py 2015-08-20 21:13:28 +0000
3+++ charmtools/compose/__init__.py 2015-08-20 21:20:52 +0000
4@@ -419,9 +419,7 @@
5
6 def main(args=None):
7 composer = Composer()
8- parser = argparse.ArgumentParser(
9- description="Compose layers into a charm",
10- formatter_class=argparse.RawDescriptionHelpFormatter,)
11+ parser = argparse.ArgumentParser(description='Compose layers into a charm')
12 parser.add_argument('-l', '--log-level', default=logging.INFO)
13 parser.add_argument('-f', '--force', action="store_true")
14 parser.add_argument('-o', '--output-dir')
15
16=== modified file 'charmtools/compose/tactics.py'
17--- charmtools/compose/tactics.py 2015-08-05 05:01:41 +0000
18+++ charmtools/compose/tactics.py 2015-08-20 21:20:52 +0000
19@@ -214,7 +214,7 @@
20 #
21 # See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
22 # for more information on this pattern.
23-from charmhelpers.core.reactive import main
24+from charms.reactive import main
25 main('{}')
26 """
27

Subscribers

People subscribed via source and target branches

to all changes: