# HG changeset patch
# User Pascal Volk <neverseen@users.sourceforge.net>
# Date 1230061194 0
# Node ID fc008eb12186978f6dff9e0869b8beb702f1f262
# Parent  0d303d15549eea69a781294b0690ebc02e8fb470
* 'VirtualMailManager/Config.py'
    - fixed parenthesis in Config.configure()

* 'setup.py'
    - updated url to http://vmm.localdomain.org/
    - adjusted long_description

* 'vmm'
    - fixed UnicodeDecodeError, that could occur with german locale.

diff -r 0d303d15549e -r fc008eb12186 VirtualMailManager/Config.py
--- a/VirtualMailManager/Config.py	Mon Dec 08 22:23:26 2008 +0000
+++ b/VirtualMailManager/Config.py	Tue Dec 23 19:39:54 2008 +0000
@@ -131,7 +131,7 @@
         except ValueError:
             self.set('config', 'done', 'False')
             self.__changes = True
-        print _(u"Using configuration file: %s\n" % self.__cfgFileName)
+        print _(u"Using configuration file: %s\n") % self.__cfgFileName
         for s in sections:
             if s != 'config':
                 print _(u'* Config section: »%s«') % s
diff -r 0d303d15549e -r fc008eb12186 setup.py
--- a/setup.py	Mon Dec 08 22:23:26 2008 +0000
+++ b/setup.py	Tue Dec 23 19:39:54 2008 +0000
@@ -10,9 +10,9 @@
 from VirtualMailManager.constants.VERSION import VERSION
 
 long_description = """
-Virtual Mail Manager is a command line tool for administrators/postmasters to
-manage domains, accounts and aliases. It's designed for Dovecot and Postfix
-with a PostgreSQL backend.
+Virtual Mail Manager is a command line tool for
+administrators/postmasters to manage domains, accounts and aliases.
+It's designed for Dovecot and Postfix with a PostgreSQL backend.
 """
 
 # remove existing MANIFEST
@@ -29,7 +29,7 @@
       author='Pascal Volk',
       author_email='p.volk@veb-it.de',
       license='BSD License',
-      url='http://vmm.sf.net/',
+      url='http://vmm.localdomain.org/',
       download_url='http://sf.net/project/showfiles.php?group_id=213727',
       platforms=['linux2', 'openbsd4'],
       classifiers=[
diff -r 0d303d15549e -r fc008eb12186 vmm
--- a/vmm	Mon Dec 08 22:23:26 2008 +0000
+++ b/vmm	Tue Dec 23 19:39:54 2008 +0000
@@ -491,4 +491,7 @@
     except (EOFError, KeyboardInterrupt):
         w_err(EXIT.USER_INTERRUPT, '\n%s!\n' % _(u'Ouch'))
     except (VMME.VMMConfigException, VMME.VMMException), e:
-        w_err(e.code(), "%s: %s" % (_(u'Error'), e.msg()))
+        if e.code() != ERR.DATABASE_ERROR:
+            w_err(e.code(), "%s: %s" % (_(u'Error'), e.msg()))
+        else:
+            w_err(e.code(), "%s" % unicode(e.msg(), ENCODING, 'replace'))