From aa6726ebd6c8499a7457a98000515b08f2f8f160 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 19 Mar 2012 13:33:39 -0400 Subject: DataSource: if public-keys is a string, split it on newline Previously, we were returning an array with a single item, which could have contained newlines in it. This does limit the potential content of a ssh public key, but it seems unlikely that in the future a valid public key would contain a newline. --- cloudinit/DataSource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cloudinit') diff --git a/cloudinit/DataSource.py b/cloudinit/DataSource.py index 1bcb9c10..e2a9150d 100644 --- a/cloudinit/DataSource.py +++ b/cloudinit/DataSource.py @@ -70,7 +70,7 @@ class DataSource: return([]) if isinstance(self.metadata['public-keys'], str): - return([self.metadata['public-keys'], ]) + return(str(self.metadata['public-keys']).splitlines()) if isinstance(self.metadata['public-keys'], list): return(self.metadata['public-keys']) -- cgit v1.2.3