← Back to branch summary

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

« back to all changes in this revision

Viewing changes to cloudinit/config/cc_bootcmd.py

  • 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:
cloudinit/config/cc_bootcmd.py
1
1
# vi: ts=4 expandtab
2
2
#
3
3
#    Copyright (C) 2009-2011 Canonical Ltd.
4
 
#    Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P.
 
4
#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
5
5
#
6
6
#    Author: Scott Moser <scott.moser@canonical.com>
7
7
#    Author: Juerg Haefliger <juerg.haefliger@hp.com>
50
50
            cmd = ['/bin/sh', tmpf.name]
51
51
            util.subp(cmd, env=env, capture=False)
52
52
        except:
53
 
            util.logexc(log, "Failed to run bootcmd module %s", name)
 
53
            util.logexc(log,
 
54
                        ("Failed to run bootcmd module %s"), name)
54
55
            raise