From 4bff6ebeebe1e77f88c128e8a0c1903a3de0667e Mon Sep 17 00:00:00 2001 From: Alexis Metaireau Date: Thu, 19 Aug 2010 14:48:58 +0200 Subject: [PATCH] Print errors if errors occurs :) Force to have a path specified. --- bin/pelican | 7 +++++-- pelican/generator.py | 2 ++ setup.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/pelican b/bin/pelican index 56c8b310..5a1f23cb 100755 --- a/bin/pelican +++ b/bin/pelican @@ -22,6 +22,9 @@ parser.add_argument('-s', '--settings', dest='settings', if __name__ == '__main__': args = parser.parse_args() files = [] - generate_output(args.path, args.templates, args.output, args.markup, + try: + generate_output(args.path, args.templates, args.output, args.markup, args.settings) - print 'Done !' + print 'Done !' + except Exception, e: + print 'Error ! %s' % e diff --git a/pelican/generator.py b/pelican/generator.py index df236efa..13c0b6ba 100644 --- a/pelican/generator.py +++ b/pelican/generator.py @@ -48,6 +48,8 @@ def generate_output(path=None, theme=None, output_path=None, markup=None, markup = markup or context['MARKUP'] # get the list of files to parse + if not path: + raise Exception('you need to speciffy a path to search the docs on !') files = [] for root, dirs, temp_files in os.walk(path, followlinks=True): files.extend([os.sep.join((root, f)) for f in temp_files diff --git a/setup.py b/setup.py index bb8b1aa5..23d794aa 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ if sys.version_info < (2,7): setup( name = "pelican", - version = '1.1', + version = '1.1.1', url = 'http://hg.lolnet.org/pelican/', author = 'Alexis Metaireau', author_email = 'alexis@notmyidea.org',