kolab-cli.py kolab.py

[Thomas Brüderli]

 kolab-cli.py |   41 +++++++++++++++++++++++++++++++++++++++++
 kolab.py     |   41 -----------------------------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

New commits:
commit c5ce78d75fe7d8325cf2467937bba7698db4eafc
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Mar 4 09:21:42 2014 -0500

    Rename kolab.py to kolab-cli.py to avoid conflicts with global libkolab bindings at kolab.*

diff --git a/kolab-cli.py b/kolab-cli.py
new file mode 100755
index 0000000..5b4d771
--- /dev/null
+++ b/kolab-cli.py
@@ -0,0 +1,41 @@
+#!/usr/bin/python
+#
+# Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3 or, at your option, any later version
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+import logging
+import os
+import sys
+
+# For development purposes
+sys.path.extend(['.', '..'])
+
+from pykolab.translate import _
+from pykolab.cli import Cli
+
+try:
+    import pykolab.logger
+except ImportError, e:
+    print >> sys.stderr, _("Cannot load pykolab/logger.py:")
+    print >> sys.stderr, "%s" % e
+    sys.exit(1)
+
+if __name__ == "__main__":
+    kolab = Cli()
+    kolab.run()
+
diff --git a/kolab.py b/kolab.py
deleted file mode 100755
index 5b4d771..0000000
--- a/kolab.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com)
-#
-# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-
-import logging
-import os
-import sys
-
-# For development purposes
-sys.path.extend(['.', '..'])
-
-from pykolab.translate import _
-from pykolab.cli import Cli
-
-try:
-    import pykolab.logger
-except ImportError, e:
-    print >> sys.stderr, _("Cannot load pykolab/logger.py:")
-    print >> sys.stderr, "%s" % e
-    sys.exit(1)
-
-if __name__ == "__main__":
-    kolab = Cli()
-    kolab.run()
-