From 7fa0d3063d5fcd564d5fcd23ce7cf3a42a9228bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Delval?= <felix@ravelsoft.com>
Date: Sat, 16 Mar 2013 19:29:10 +0100
Subject: [PATCH] Creating a more explicit error message at server creation

---
 pelican/server.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pelican/server.py b/pelican/server.py
index b427a6c3..602d3b21 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -1,4 +1,5 @@
 from __future__ import print_function
+import sys
 try:
     import SimpleHTTPServer as srvmod
 except ImportError:
@@ -13,7 +14,12 @@ PORT = 8000
 
 Handler = srvmod.SimpleHTTPRequestHandler
 
-httpd = socketserver.TCPServer(("", PORT), Handler)
+try:
+    httpd = socketserver.TCPServer(("", PORT), Handler)
+except OSError as e:
+    print("Could not listen on port", PORT)
+    sys.exit(getattr(e, 'exitcode', 1))
+
 
 print("serving at port", PORT)
 httpd.serve_forever()