From f5a2acf128c9386468d6ef4d3bbee47e0c30622a Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sun, 7 Jul 2013 18:07:15 +0200
Subject: [PATCH] Remove usage of glob

---
 providers/ec2/tasks/apt.py     |  5 ++---
 providers/ec2/tasks/boot.py    |  8 +++-----
 providers/ec2/tasks/cleanup.py | 11 +++++------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/providers/ec2/tasks/apt.py b/providers/ec2/tasks/apt.py
index ca51cd7..1b98776 100644
--- a/providers/ec2/tasks/apt.py
+++ b/providers/ec2/tasks/apt.py
@@ -64,9 +64,8 @@ class AptClean(Task):
 	def run(self, info):
 		log_check_call(['chroot', info.root, 'apt-get', 'clean'])
 
-		import glob
-		lists = glob.glob(os.path.join(info.root, 'var/lib/apt/lists/*'))
-		for list_file in lists:
+		lists = os.path.join(info.root, 'var/lib/apt/lists')
+		for list_file in [os.path.join(lists, f) for f in os.listdir(lists)]:
 			if os.path.isfile(list_file):
 				os.remove(list_file)
 
diff --git a/providers/ec2/tasks/boot.py b/providers/ec2/tasks/boot.py
index 29a610d..05da41f 100644
--- a/providers/ec2/tasks/boot.py
+++ b/providers/ec2/tasks/boot.py
@@ -1,6 +1,6 @@
 from base import Task
 from common import phases
-import os.path
+import os
 
 
 class ConfigureGrub(Task):
@@ -14,10 +14,8 @@ class ConfigureGrub(Task):
 		             stat.S_IROTH                | stat.S_IXOTH)
 		x_all = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
 
-		import os
-		import glob
-		grub2_cfgs = glob.glob(os.path.join(info.root, 'etc/grub.d/*'))
-		for cfg in grub2_cfgs:
+		grubd = os.path.join(info.root, 'etc/grub.d')
+		for cfg in [os.path.join(grubd, f) for f in os.listdir(grubd)]:
 			os.chmod(cfg, os.stat(cfg).st_mode & ~ x_all)
 
 		from shutil import copy
diff --git a/providers/ec2/tasks/cleanup.py b/providers/ec2/tasks/cleanup.py
index 46ff017..7b793a4 100644
--- a/providers/ec2/tasks/cleanup.py
+++ b/providers/ec2/tasks/cleanup.py
@@ -34,11 +34,10 @@ class CleanTMP(Task):
 	phase = phases.system_cleaning
 
 	def run(self, info):
-		import glob
-		tmp_files = glob.glob(os.path.join(info.root, 'tmp/*'))
-		for tmp_file in tmp_files:
+		tmp = os.path.join(info.root, 'tmp')
+		for tmp_file in [os.path.join(tmp, f) for f in os.listdir(tmp)]:
 			os.remove(tmp_file)
 
-		log_files = glob.glob(os.path.join(info.root, 'var/log/{bootstrap,dpkg}.log'))
-		for log_file in log_files:
-			os.remove(log_file)
+		log = os.path.join(info.root, 'var/log/')
+		os.remove(os.path.join(log, 'bootstrap.log'))
+		os.remove(os.path.join(log, 'dpkg.log'))