Imported Upstream version 7.0.1upstream/7.0.1

1 files changed, 3 insertions, 2 deletions

diff --git a/nikola/plugins/basic_import.py b/nikola/plugins/basic_import.py
index 27c0eb4..7b23f9c 100644
--- a/nikola/plugins/basic_import.py
+++ b/nikola/plugins/basic_import.py
@@ -29,6 +29,7 @@ import codecs
 import csv
 import datetime
 import os
+from pkg_resources import resource_filename
 
 try:
     from urlparse import urlparse
@@ -89,13 +90,13 @@ class ImportMixin(object):
 
     def generate_base_site(self):
         if not os.path.exists(self.output_folder):
-            os.system('nikola init ' + self.output_folder)
+            os.system('nikola init -q ' + self.output_folder)
         else:
             self.import_into_existing_site = True
             utils.LOGGER.notice('The folder {0} already exists - assuming that this is a '
                                 'already existing Nikola site.'.format(self.output_folder))
 
-        filename = os.path.join(os.path.dirname(utils.__file__), 'conf.py.in')
+        filename = resource_filename('nikola', 'conf.py.in')
         # The 'strict_undefined=True' will give the missing symbol name if any,
         # (ex: NameError: 'THEME' is not defined )
         # for other errors from mako/runtime.py, you can add format_extensions=True ,