summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-07-09 14:01:36 -0400
committerScott Moser <smoser@ubuntu.com>2012-07-09 14:01:36 -0400
commit285e127de45f0feed7170bafc79b502170d5b381 (patch)
treede01eb4c3d8e17552f3b725386452bae9bf46f27
parent972c4e0d1bcfe40414dfb08525eb0fc35cec102e (diff)
downloadvyos-cloud-init-285e127de45f0feed7170bafc79b502170d5b381.tar.gz
vyos-cloud-init-285e127de45f0feed7170bafc79b502170d5b381.zip
fix 'make pylint' warnings
On my system (quantal) this 'make pylint' does not complain now.
-rw-r--r--cloudinit/sources/DataSourceEc2.py3
-rw-r--r--cloudinit/util.py6
2 files changed, 6 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
index 6f7cfd43..cde73de3 100644
--- a/cloudinit/sources/DataSourceEc2.py
+++ b/cloudinit/sources/DataSourceEc2.py
@@ -98,7 +98,8 @@ class DataSourceEc2(sources.DataSource):
if not availability_zone:
return None
- mirror_tpl = self.distro.get_option('package_mirror_ec2_template', None)
+ mirror_tpl = self.distro.get_option('package_mirror_ec2_template',
+ None)
if mirror_tpl is None:
return None
diff --git a/cloudinit/util.py b/cloudinit/util.py
index d0d7a303..44ce9770 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -19,6 +19,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# pylint: disable=C0302
from StringIO import StringIO
@@ -936,8 +938,8 @@ def chownbyname(fname, user=None, group=None):
if group:
gid = grp.getgrnam(group).gr_gid
except KeyError:
- logexc(LOG, ("Failed changing the ownership of %s using username %s and"
- " groupname %s (do they exist?)"), fname, user, group)
+ logexc(LOG, ("Failed changing the ownership of %s using username %s "
+ "and groupname %s (do they exist?)"), fname, user, group)
return False
chownbyid(fname, uid, gid)
return True