Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #335 from schettino72/b151-fixes

#151 fixes
  • Loading branch information...
commit 9cf05560beef293ea5299c389dbf60f39813844c 2 parents 361b8f5 + 8661f4d
@ralsina authored
View
2  nikola/main.py
@@ -46,7 +46,7 @@ def main(args):
config = {}
site = Nikola(**config)
- DoitNikola(site).run(args)
+ return DoitNikola(site).run(args)
class Help(DoitHelp):
View
2  nikola/plugins/command_import_wordpress.py
@@ -144,7 +144,7 @@ def configure_redirections(url_map):
def generate_base_site(self):
if not os.path.exists(self.output_folder):
- os.system('nikola init --empty ' +self.output_folder)
+ os.system('nikola init ' +self.output_folder)
else:
self.import_into_existing_site = True
print('The folder {0} already exists - assuming that this is a '
View
2  scripts/nikola
@@ -34,4 +34,4 @@ else:
from nikola import main
if __name__ == "__main__":
- main.main(sys.argv[1:])
+ sys.exit(main.main(sys.argv[1:]))
Please sign in to comment.
Something went wrong with that request. Please try again.