From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 20 May 2012 13:51:28 +0000 (-0400)
Subject: - [bug] Fixed bug whereby directories inside of
X-Git-Tag: rel_0_3_3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb160dbf30440144d002810ebd5c5520e37562d7;p=thirdparty%2Fsqlalchemy%2Falembic.git

- [bug] Fixed bug whereby directories inside of
  the template directories, such as __pycache__
  on Pypy, would mistakenly be interpreted as
  files which are part of the template. #49
---

diff --git a/CHANGES b/CHANGES
index 093c5f64..e075dcf1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,11 @@
   "alembic downgrade -1".  Courtesy 
   Atsushi Odagiri for this feature.
 
+- [bug] Fixed bug whereby directories inside of 
+  the template directories, such as __pycache__
+  on Pypy, would mistakenly be interpreted as 
+  files which are part of the template. #49
+
 0.3.2
 =====
 - [feature] Basic support for Oracle added, 
diff --git a/alembic/command.py b/alembic/command.py
index ed7b8302..98a054b5 100644
--- a/alembic/command.py
+++ b/alembic/command.py
@@ -39,20 +39,21 @@ def init(config, directory, template='generic'):
     script = ScriptDirectory(directory)
 
     for file_ in os.listdir(template_dir):
+        file_path = os.path.join(template_dir, file_)
         if file_ == 'alembic.ini.mako':
             config_file = os.path.abspath(config.config_file_name)
             if os.access(config_file, os.F_OK):
                 util.msg("File %s already exists, skipping" % config_file)
             else:
                 script._generate_template(
-                    os.path.join(template_dir, file_),
+                    file_path,
                     config_file,
                     script_location=directory
                 )
-        else:
+        elif os.path.isfile(file_path):
             output_file = os.path.join(directory, file_)
             script._copy_file(
-                os.path.join(template_dir, file_), 
+                file_path,
                 output_file
             )