From 042fb11fa107718a831d468d16188e02f6ae3712 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Fri, 18 Jan 2008 16:20:36 -0500
Subject: Fix issues reported by rpmlint.

- Removing shebangs (#!) from a bunch of python libraries
- Don't use a variable name in init scripts for the lock file
- Keep the init script name consistent with the binary name, so renamed
  ipa-kpasswd.init to ipa_kpasswd.init
- Add status option to the init scripts
- Move most python scripts out of /usr/share/ipa and into the python
  site-packages directories (ipaserver and ipaclient)
- Remove unnecessary sys.path.append("/usr/share/ipa")
- Fix the license string in the spec files
- Rename ipa-webgui to ipa_webgui everywhere
- Fix a couple of issues reported by pychecker in ipa-python
---
 ipa-server/xmlrpc-server/Makefile.am  | 8 ++++++--
 ipa-server/xmlrpc-server/funcs.py     | 3 +--
 ipa-server/xmlrpc-server/ipaxmlrpc.py | 4 +---
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'ipa-server/xmlrpc-server')

diff --git a/ipa-server/xmlrpc-server/Makefile.am b/ipa-server/xmlrpc-server/Makefile.am
index 5e9da0651..cf1420197 100644
--- a/ipa-server/xmlrpc-server/Makefile.am
+++ b/ipa-server/xmlrpc-server/Makefile.am
@@ -10,10 +10,14 @@ html_DATA =			\
 	unauthorized.html	\
 	$(NULL)
 
-serverdir = $(IPA_DATA_DIR)/ipaserver
-server_PYTHON =			\
+coredir = $(pythondir)/ipaserver
+core_PYTHON =			\
 	attrs.py		\
 	funcs.py		\
+	$(NULL)
+
+serverdir = $(IPA_DATA_DIR)/ipaserver
+server_PYTHON =			\
 	ipaxmlrpc.py		\
 	$(NULL)
 
diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py
index d0600b51a..cc2705d24 100644
--- a/ipa-server/xmlrpc-server/funcs.py
+++ b/ipa-server/xmlrpc-server/funcs.py
@@ -18,7 +18,6 @@
 #
 
 import sys
-sys.path.append("/usr/share/ipa")
 
 import krbV
 import ldap
@@ -26,7 +25,7 @@ import ldap.dn
 import ipaserver.dsinstance
 import ipaserver.ipaldap
 import copy
-import attrs
+from ipaserver import attrs
 from ipa import ipaerror
 from ipa import ipautil
 from urllib import quote,unquote
diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py
index 3f3e38b8e..59f5e596c 100644
--- a/ipa-server/xmlrpc-server/ipaxmlrpc.py
+++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py
@@ -24,7 +24,6 @@
 # Rob Crittenden <rcritten@redhat.com>
 
 import sys
-sys.path.append("/usr/share/ipa")
 
 
 import time
@@ -34,8 +33,7 @@ from xmlrpclib import Marshaller,loads,dumps,Fault
 from mod_python import apache
 import logging
 
-import ipaserver
-import funcs
+from ipaserver import funcs
 from ipa import ipaerror, ipautil
 import ldap
 
-- 
cgit