# HG changeset patch # User Pascal Volk # Date 1249778276 0 # Node ID 485d3f7d6981c12706901b27014c89f9ae74b0b3 # Parent 0ab6f74aa1655ef3f992473a278bc7aea1e71660 Removed svn keywords, more POSIX compliant shell scripts Removed the subversion keywords $Date$, $Id$ and $Rev$ from all files. Added centralized versions information from VirtualMailManager.constants.VERSION to many files. install.sh and upgrade.sh do now strict POSIX compliant string comparison in expressions. Fixed a type in upgrade.sh. Updated copyright information diff -r 0ab6f74aa165 -r 485d3f7d6981 COPYING --- a/COPYING Fri Aug 07 02:40:34 2009 +0200 +++ b/COPYING Sun Aug 09 00:37:56 2009 +0000 @@ -1,4 +1,4 @@ -Copyright (c) 2007 - 2008, VEB IT +Copyright (c) 2007 - 2009, VEB IT All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff -r 0ab6f74aa165 -r 485d3f7d6981 TODO --- a/TODO Fri Aug 07 02:40:34 2009 +0200 +++ b/TODO Sun Aug 09 00:37:56 2009 +0000 @@ -1,4 +1,3 @@ -# $Id$ - Aliases - avoid looping aliases diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/Account.py --- a/VirtualMailManager/Account.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/Account.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,16 +1,10 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """Virtual Mail Manager's Account class to manage e-mail accounts.""" -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * from Exceptions import VMMAccountException as AccE from Domain import Domain diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/Alias.py --- a/VirtualMailManager/Alias.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/Alias.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,16 +1,10 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """Virtual Mail Manager's Alias class to manage e-mail aliases.""" -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * from Exceptions import VMMAliasException as VMMAE from Domain import Domain diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/AliasDomain.py --- a/VirtualMailManager/AliasDomain.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/AliasDomain.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,16 +1,10 @@ # -*- coding: UTF-8 -*- -# Copyright 2008 VEB IT +# Copyright (c) 2008 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """Virtual Mail Manager's AliasDomain class to manage alias domains.""" -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * from Exceptions import VMMAliasDomainException as VADE import constants.ERROR as ERR diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/Config.py --- a/VirtualMailManager/Config.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/Config.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,19 +1,13 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """Configurtion class for read, modify and write the configuration from Virtual Mail Manager. """ -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * import locale import sys diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/Domain.py --- a/VirtualMailManager/Domain.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/Domain.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,16 +1,10 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """Virtual Mail Manager's Domain class to manage e-mail domains.""" -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * from random import choice diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/EmailAddress.py --- a/VirtualMailManager/EmailAddress.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/EmailAddress.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,16 +1,10 @@ # -*- coding: UTF-8 -*- -# Copyright 2008 VEB IT +# Copyright (c) 2008 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """Virtual Mail Manager's EmailAddress class to handle e-mail addresses.""" -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * import re diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/Exceptions.py --- a/VirtualMailManager/Exceptions.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/Exceptions.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,16 +1,10 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """Exception classes for Virtual Mail Manager""" -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * class VMMException(Exception): """Exception class for VirtualMailManager exceptions""" diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/MailLocation.py --- a/VirtualMailManager/MailLocation.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/MailLocation.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,17 +1,11 @@ # -*- coding: UTF-8 -*- -# Copyright 2008 VEB IT +# Copyright (c) 2008 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """Virtual Mail Manager's MailLocation class to manage the mail_location for accounts.""" -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * import re diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/Relocated.py --- a/VirtualMailManager/Relocated.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/Relocated.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,16 +1,10 @@ # -*- coding: UTF-8 -*- -# Copyright 2008 VEB IT +# Copyright (c) 2008 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """Virtual Mail Manager's Relocated class to manage relocated users.""" -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * from Exceptions import VMMRelocatedException as VMMRE from Domain import Domain diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/Transport.py --- a/VirtualMailManager/Transport.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/Transport.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,17 +1,11 @@ # -*- coding: UTF-8 -*- -# Copyright 2008 VEB IT +# Copyright (c) 2008 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """Virtual Mail Manager's Transport class to manage the transport for domains and accounts.""" -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * from Exceptions import VMMTransportException import constants.ERROR as ERR diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/VirtualMailManager.py --- a/VirtualMailManager/VirtualMailManager.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/VirtualMailManager.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,16 +1,10 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """The main class for vmm.""" -from constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from constants.VERSION import * import os import re diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/__init__.py --- a/VirtualMailManager/__init__.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/__init__.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,7 +1,6 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ # package placeholder # # EOF diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/constants/ERROR.py --- a/VirtualMailManager/constants/ERROR.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/constants/ERROR.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,7 +1,6 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ ACCOUNT_AND_ALIAS_PRESENT = 20 ACCOUNT_EXISTS = 21 diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/constants/EXIT.py --- a/VirtualMailManager/constants/EXIT.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/constants/EXIT.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,7 +1,6 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ MISSING_ARGS = 1 UNKNOWN_COMMAND = 2 diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/constants/VERSION.py --- a/VirtualMailManager/constants/VERSION.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/constants/VERSION.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,8 +1,11 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ -VERSION = '0.5' -REVISION = 'rev '+'$Rev$'.split()[1] -RELDATE = '$Date$'.split()[1] +AUTHOR = 'Pascal Volk ' +RELDATE = '2008-11-27' +VERSION = '0.5.1-dev' +__author__ = AUTHOR +__date__ = RELDATE +__version__ = VERSION +__all__ = ['__author__', '__date__', '__version__'] diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/constants/__init__.py --- a/VirtualMailManager/constants/__init__.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/constants/__init__.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,7 +1,6 @@ # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright (c) 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ # package placeholder # # EOF diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/ext/Postconf.py --- a/VirtualMailManager/ext/Postconf.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/ext/Postconf.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,16 +1,10 @@ # -*- coding: UTF-8 -*- -# Copyright 2008 VEB IT +# Copyright (c) 2008 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """A small - r/o - wrapper class for Postfix' postconf.""" -from VirtualMailManager.constants.VERSION import VERSION - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from VirtualMailManager.constants.VERSION import * import re from subprocess import Popen, PIPE diff -r 0ab6f74aa165 -r 485d3f7d6981 VirtualMailManager/ext/__init__.py --- a/VirtualMailManager/ext/__init__.py Fri Aug 07 02:40:34 2009 +0200 +++ b/VirtualMailManager/ext/__init__.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,7 +1,6 @@ # -*- coding: UTF-8 -*- -# Copyright 2008 VEB IT +# Copyright (c) 2008 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ # package placeholder # # EOF diff -r 0ab6f74aa165 -r 485d3f7d6981 create_optional_types_and_functions.pgsql --- a/create_optional_types_and_functions.pgsql Fri Aug 07 02:40:34 2009 +0200 +++ b/create_optional_types_and_functions.pgsql Sun Aug 09 00:37:56 2009 +0000 @@ -1,5 +1,3 @@ --- $Id$ - -- --- Information: -- This file contains some data types and functions these should speed up some -- operations. Read the comment on each data type/functions for more details. diff -r 0ab6f74aa165 -r 485d3f7d6981 create_tables.pgsql --- a/create_tables.pgsql Fri Aug 07 02:40:34 2009 +0200 +++ b/create_tables.pgsql Sun Aug 09 00:37:56 2009 +0000 @@ -1,5 +1,3 @@ --- $Id$ - SET client_encoding = 'UTF8'; SET client_min_messages = warning; diff -r 0ab6f74aa165 -r 485d3f7d6981 install.sh --- a/install.sh Fri Aug 07 02:40:34 2009 +0200 +++ b/install.sh Sun Aug 09 00:37:56 2009 +0000 @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ # # Installation script for the Virtual Mail Manager # run: ./install.sh @@ -12,7 +11,7 @@ PF_GID=$(id -g $(postconf -h mail_owner)) LOCALE_DIR=${PREFIX}/share/locale DOC_DIR=${PREFIX}/share/doc/vmm -if [ ${PREFIX} == "/usr" ]; then +if [ ${PREFIX} = "/usr" ]; then MANDIR=${PREFIX}/share/man else MANDIR=${PREFIX}/man diff -r 0ab6f74aa165 -r 485d3f7d6981 man/de/man1/vmm.1 --- a/man/de/man1/vmm.1 Fri Aug 07 02:40:34 2009 +0200 +++ b/man/de/man1/vmm.1 Sun Aug 09 00:37:56 2009 +0000 @@ -1,4 +1,3 @@ -.\" $Id$ .TH "VMM" "1" "5. Okt 2008" "Pascal Volk" .SH NAME vmm \- Programm für die Kommandozeile, um E-Mail-Domains, -Konten und -Aliase zu diff -r 0ab6f74aa165 -r 485d3f7d6981 man/de/man5/vmm.cfg.5 --- a/man/de/man5/vmm.cfg.5 Fri Aug 07 02:40:34 2009 +0200 +++ b/man/de/man5/vmm.cfg.5 Sun Aug 09 00:37:56 2009 +0000 @@ -1,4 +1,3 @@ -.\" $Id$ .TH vmm.cfg 5 "08 Dez 2008" "Pascal Volk" .SH NAME vmm.cfg \- Konfigurationsdatei für vmm diff -r 0ab6f74aa165 -r 485d3f7d6981 man/man1/vmm.1 --- a/man/man1/vmm.1 Fri Aug 07 02:40:34 2009 +0200 +++ b/man/man1/vmm.1 Sun Aug 09 00:37:56 2009 +0000 @@ -1,4 +1,3 @@ -.\" $Id$ .TH "VMM" "1" "5 Oct 2008" "Pascal Volk" .SH NAME vmm \- command line tool to manage email domains/accounts/aliases diff -r 0ab6f74aa165 -r 485d3f7d6981 man/man5/vmm.cfg.5 --- a/man/man5/vmm.cfg.5 Fri Aug 07 02:40:34 2009 +0200 +++ b/man/man5/vmm.cfg.5 Sun Aug 09 00:37:56 2009 +0000 @@ -1,4 +1,3 @@ -.\" $Id$ .TH vmm.cfg 5 "08 Dec 2008" "Pascal Volk" .SH NAME vmm.cfg \- configuration file for vmm diff -r 0ab6f74aa165 -r 485d3f7d6981 setup.cfg --- a/setup.cfg Fri Aug 07 02:40:34 2009 +0200 +++ b/setup.cfg Sun Aug 09 00:37:56 2009 +0000 @@ -1,4 +1,3 @@ -# $Id$ [install] compile = 1 optimize = 1 diff -r 0ab6f74aa165 -r 485d3f7d6981 setup.py --- a/setup.py Fri Aug 07 02:40:34 2009 +0200 +++ b/setup.py Sun Aug 09 00:37:56 2009 +0000 @@ -1,8 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ import os from distutils.core import setup diff -r 0ab6f74aa165 -r 485d3f7d6981 upgrade.sh --- a/upgrade.sh Fri Aug 07 02:40:34 2009 +0200 +++ b/upgrade.sh Sun Aug 09 00:37:56 2009 +0000 @@ -1,8 +1,7 @@ #!/bin/sh -# $Id$ # # Upgrade script for the Virtual Mail Manager -# run: ./install.sh +# run: ./upgrade.sh LANG=C PATH=/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin @@ -12,7 +11,7 @@ PF_GID=$(id -g $(postconf -h mail_owner)) LOCALE_DIR=${PREFIX}/share/locale DOC_DIR=${PREFIX}/share/doc/vmm -if [ ${PREFIX} == "/usr" ]; then +if [ ${PREFIX} = "/usr" ]; then MANDIR=${PREFIX}/share/man else MANDIR=${PREFIX}/man diff -r 0ab6f74aa165 -r 485d3f7d6981 vmm --- a/vmm Fri Aug 07 02:40:34 2009 +0200 +++ b/vmm Sun Aug 09 00:37:56 2009 +0000 @@ -1,17 +1,11 @@ #!/usr/bin/env python # -*- coding: UTF-8 -*- -# Copyright 2007-2008 VEB IT +# Copyright 2007 - 2009, VEB IT # See COPYING for distribution information. -# $Id$ """This is the vmm main script.""" -from VirtualMailManager.constants.VERSION import VERSION, REVISION, RELDATE - -__author__ = 'Pascal Volk ' -__version__ = VERSION -__revision__ = 'rev '+'$Rev$'.split()[1] -__date__ = '$Date$'.split()[1] +from VirtualMailManager.constants.VERSION import * import locale import os @@ -410,10 +404,11 @@ w_std( " * %s" % warning) def show_version(): - w_std("%s, %s %s (%s %s %s)\nPython %s %s %s\n" % (__prog__, _('version'), - __version__, REVISION, _('from'), strftime( - locale.nl_langinfo(locale.D_FMT), strptime(RELDATE, '%Y-%m-%d')), - sys.version.split()[0], _(u'on'), os.uname()[0])) + w_std('%s, %s %s (%s %s)\nPython %s %s %s\n\n%s %s' % (__prog__, + _('version'), __version__, _('from'), strftime( + locale.nl_langinfo(locale.D_FMT), strptime(__date__, '%Y-%m-%d')), + sys.version.split()[0], _(u'on'), os.uname()[0], __prog__, + 'is free software and comes with ABSOLUTELY NO WARRANTY.')) #def main(): if __name__ == '__main__': diff -r 0ab6f74aa165 -r 485d3f7d6981 vmm.cfg --- a/vmm.cfg Fri Aug 07 02:40:34 2009 +0200 +++ b/vmm.cfg Sun Aug 09 00:37:56 2009 +0000 @@ -1,4 +1,3 @@ -# $Id$ # This is the Virtual Mail Manager (vmm) configuration file. # location: /usr/local/etc/vmm.cfg #