Merge from alioth

diff --git a/debian/changelog b/debian/changelog
index 4219b3f..0459844 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,8 +34,10 @@ userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
     filename
   * Remove use of deprecated functions from the string module
   * ud-arbimport: os.exit -> sys.exit
+  * add simple ud-config script for use in shell scripts.  This allows
+    querying config values.
 
- -- Peter Palfrader <weasel@debian.org>  Thu, 10 Jan 2008 15:32:16 +0100
+ -- Peter Palfrader <weasel@debian.org>  Thu, 10 Jan 2008 15:34:46 +0100
 
 userdir-ldap (0.3.15) unstable; urgency=low
 

diff --git a/ud-config b/ud-config
new file mode 100755 (executable)
index 0000000..6a9b53c
--- /dev/null
+++ b/ud-config
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+#
+#   Copyright (c) 2007  Mark Hymers <mhy@debian.org>
+#
+#   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; either version 2 of the License, 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 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sys
+import userdir_ldap
+
+usage = '''Usage: ud-config VARIABLE
+Prints config information from userdir-ldap.conf'''
+
+if len(sys.argv) != 2:
+    print usage
+    sys.exit(1)
+
+try:
+    res = getattr(userdir_ldap.ConfModule, sys.argv[1])
+    print res
+except AttributeError:
+    sys.exit(1)