import cleanups

diff --git a/ChangeLog b/ChangeLog
index 97cab638fb2e7cc9440ec790c92843dbb0abedf1..42ad6a9149c3d6f03fc74afaada53968cda77866 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/support.py, modules/catalyst/util.py:
+  import cleanups
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/support.py, modules/catalyst/target/generic_stage.py,
   modules/catalyst/util.py:

diff --git a/modules/catalyst/support.py b/modules/catalyst/support.py
index 6354ac5ef1f9ad8b2e29604014e1c9af2de1255a..e2d7afe60566a227daaacda4685b6b965bcf9b2f 100644 (file)
--- a/modules/catalyst/support.py
+++ b/modules/catalyst/support.py
@@ -1,5 +1,4 @@
 
-import os, re
 from catalyst.error import *
 
 required_config_file_values=["storedir","sharedir","distdir","portdir"]

diff --git a/modules/catalyst/util.py b/modules/catalyst/util.py
index d6a71224243ca077bc2b5d0d59d23f089815b56e..25823a25f6a575fc1c9094ad69824536d8f72688 100644 (file)
--- a/modules/catalyst/util.py
+++ b/modules/catalyst/util.py
@@ -2,7 +2,7 @@
 Collection of utility functions for catalyst
 """
 
-import sys, traceback, os, os.path
+import sys, traceback, os, os.path, re
 from catalyst.error import *
 
 def capture_traceback():