← Back to branch summary

~smoser/ubuntu/xenial/cloud-init/lp1506187

« back to all changes in this revision

Viewing changes to tools/ccfg-merge-debug

  • Committer: Package Import Robot
  • Author(s): Scott Moser
  • Date: 2013-04-11 12:55:51 UTC
  • mfrom: (245.3.9 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20130411125551-8k60jsoot7t21z4b
https://launchpad.net/bugs/1164147
* New upstream snapshot.
  * make apt-get invoke 'dist-upgrade' rather than 'upgrade' for
    package_upgrade. (LP: #1164147)
  * workaround 2.6 kernel issue that stopped blkid from showing /dev/sr0

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/ccfg-merge-debug
3
3
from cloudinit import handlers
4
4
from cloudinit.handlers import cloud_config as cc_part
5
5
from cloudinit import helpers
6
 
from cloudinit import log as logging
7
6
from cloudinit.settings import PER_INSTANCE
8
7
from cloudinit import user_data as ud
9
8
 
18
17
        description='test cloud-config merging')
19
18
    parser.add_argument("--output", "-o", metavar="file",
20
19
        help="specify output file", default="-")
21
 
    parser.add_argument('--verbose', '-v', action='count', default=0)
22
20
    parser.add_argument('files', nargs='+')
23
21
 
24
22
    args = parser.parse_args()
25
 
 
26
 
    if args.verbose:
27
 
        level = (logging.WARN, logging.INFO,
28
 
                 logging.DEBUG)[min(args.verbose, 2)]
29
 
        logging.setupBasicLogging(level)
30
 
 
31
23
    outfile = args.output
32
24
    if args.output == "-":
33
25
        outfile = "/dev/stdout"