← Back to branch summary

~corey.bryant/charms/precise/charm-helpers/1294140

« back to all changes in this revision

Viewing changes to bin/contrib/charmsupport/charmsupport

  • Committer: Matthew Wedgwood
  • Date: 2013-05-11 20:24:29 UTC
  • Revision ID: matthew.wedgwood@canonical.com-20130511202429-i18umt87kbmbcdye
Fixup for charmsupport, adopt package infrastructure

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/contrib/charmsupport/charmsupport
1
1
#!/usr/bin/env python
2
2
 
3
3
import argparse
4
 
import charmsupport.execd
5
 
 
6
 
 
7
 
def execd(args):
8
 
    charmsupport.execd.execd_run(args.module, args.dir, die_on_error=True)
 
4
from charmhelpers.contrib.charmsupport import execd
 
5
 
 
6
 
 
7
def run_execd(args):
 
8
    execd.execd_run(args.module, args.dir, die_on_error=True)
9
9
 
10
10
 
11
11
def parse_args():
18
18
                              help='module to run (default: charm-pre-install)')
19
19
    execd_parser.add_argument('--dir',
20
20
                              help="Override the exec.d directory path")
21
 
    execd_parser.set_defaults(func=execd)
 
21
    execd_parser.set_defaults(func=run_execd)
22
22
 
23
23
    return parser.parse_args()
24
24