[2713] Use SYSCONFDIR for csv file

I know it's a different ticket but it seemed to easy not to do here

Also fixed a coupld of distcheck issues with .pyc files

diff --git a/src/bin/usermgr/Makefile.am b/src/bin/usermgr/Makefile.am
index 08c9f9ab2c75fc5bfd19d980679cfe0644dffcc3..540d675c0ebfd721430f163453c2dbb916e8da3c 100644 (file)
--- a/src/bin/usermgr/Makefile.am
+++ b/src/bin/usermgr/Makefile.am
@@ -4,7 +4,7 @@ sbin_SCRIPTS = b10-cmdctl-usermgr
 
 b10_cmdctl_usermgrdir = $(pkgdatadir)
 
-CLEANFILES=    b10-cmdctl-usermgr
+CLEANFILES=    b10-cmdctl-usermgr b10-cmdctl-usermgr.pyc
 
 man_MANS = b10-cmdctl-usermgr.8
 DISTCLEANFILES = $(man_MANS)
@@ -27,3 +27,7 @@ endif
 b10-cmdctl-usermgr: b10-cmdctl-usermgr.py
        $(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" b10-cmdctl-usermgr.py >$@
        chmod a+x $@
+
+CLEANDIRS = __pycache__
+clean-local:
+       rm -rf $(CLEANDIRS)

diff --git a/src/bin/usermgr/b10-cmdctl-usermgr.py.in b/src/bin/usermgr/b10-cmdctl-usermgr.py.in
index 3cb0eea4a2203850ab3c47cee1d4b72cfd66409f..8f6216c6893d8b9466430439394b4090f1f2518a 100644 (file)
--- a/src/bin/usermgr/b10-cmdctl-usermgr.py.in
+++ b/src/bin/usermgr/b10-cmdctl-usermgr.py.in
@@ -19,6 +19,7 @@
 This file implements user management program. The user name and
 its password is appended to csv file.
 '''
+from bind10_config import SYSCONFPATH
 import random
 from hashlib import sha1
 import csv
@@ -31,7 +32,7 @@ import isc.util.process
 isc.util.process.rename()
 
 VERSION_STRING = 'b10-cmdctl-usermgr @PACKAGE_VERSION@'
-DEFAULT_FILE = 'cmdctl-accounts.csv'
+DEFAULT_FILE = SYSCONFPATH + '/cmdctl-accounts.csv'
 
 class UserManager:
     def __init__(self, options):

diff --git a/src/bin/usermgr/tests/b10-cmdctl-usermgr_test.py b/src/bin/usermgr/tests/b10-cmdctl-usermgr_test.py
index 6a233101b5ceb0d6931c08f7ecd19ca61e03f688..5d69a41795cdb6dd15664d8da44088a5c8939bf7 100644 (file)
--- a/src/bin/usermgr/tests/b10-cmdctl-usermgr_test.py
+++ b/src/bin/usermgr/tests/b10-cmdctl-usermgr_test.py
@@ -19,6 +19,7 @@ import imp
 import os
 import subprocess
 import unittest
+from bind10_config import SYSCONFPATH
 
 def run(command):
     """
@@ -155,7 +156,8 @@ Options:
         """
         # Hardcoded path .. should be ok since this is run from make check
         usermgr = imp.load_source('usermgr', '../b10-cmdctl-usermgr.py')
-        self.assertEqual('cmdctl-accounts.csv', usermgr.DEFAULT_FILE)
+        self.assertEqual(SYSCONFPATH + '/cmdctl-accounts.csv',
+                         usermgr.DEFAULT_FILE)
 
 if __name__== '__main__':
     unittest.main()

diff --git a/src/lib/python/bind10_config.py.in b/src/lib/python/bind10_config.py.in
index 9cd8d66ad758407e3627ff29599de3eb3d05d31a..2840d19d3190dd25e735752c4b007a3e6ee30c14 100644 (file)
--- a/src/lib/python/bind10_config.py.in
+++ b/src/lib/python/bind10_config.py.in
@@ -24,11 +24,13 @@ def reload():
     global PLUGIN_PATHS
     global PREFIX
     global LIBEXECPATH
+    global SYSCONFPATH
     BIND10_MSGQ_SOCKET_FILE = os.path.join("@localstatedir@",
                                            "@PACKAGE_NAME@",
                                            "msgq_socket").replace("${prefix}",
                                                                   "@prefix@")
     PREFIX = "@prefix@"
+    SYSCONFPATH="@sysconfdir@/@PACKAGE@".replace('${prefix}', PREFIX)
 
     # B10_FROM_SOURCE is set in the environment for internal tests and
     # an experimental run without installagion.  In that case we need to