merge from 0.7.9 at 0.7.9

1 files changed, 7 insertions, 16 deletions

diff --git a/cloudinit/sources/DataSourceCloudSigma.py b/cloudinit/sources/DataSourceCloudSigma.py
index be74503b..ffc23e3d 100644
--- a/cloudinit/sources/DataSourceCloudSigma.py
+++ b/cloudinit/sources/DataSourceCloudSigma.py
@@ -1,20 +1,9 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2014 CloudSigma
-#
-#    Author: Kiril Vladimiroff <kiril.vladimiroff@cloudsigma.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
+# Copyright (C) 2014 CloudSigma
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Author: Kiril Vladimiroff <kiril.vladimiroff@cloudsigma.com>
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of cloud-init. See LICENSE file for license information.
+
 from base64 import b64decode
 import re
 
@@ -115,7 +104,7 @@ DataSourceCloudSigmaNet = DataSourceCloudSigma
 # Used to match classes to dependencies. Since this datasource uses the serial
 # port network is not really required, so it's okay to load without it, too.
 datasources = [
-    (DataSourceCloudSigma, (sources.DEP_FILESYSTEM)),
+    (DataSourceCloudSigma, (sources.DEP_FILESYSTEM, )),
 ]
 
 
@@ -124,3 +113,5 @@ def get_datasource_list(depends):
     Return a list of data sources that match this set of dependencies
     """
     return sources.list_from_depends(depends, datasources)
+
+# vi: ts=4 expandtab