From cb59e85c2ea5ebccd2efe98d965e1a331c11be0f Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Sat, 27 Jan 2007 18:48:26 -0500 Subject: [PATCH] Moved files into their new locations prior to commit of 0.2. The changes in most files between 0.1 and 0.2 are so large that git is unable to automatically detect the renames that took place. This commit moves files into their new locations so that the history is accurate. --- debian/rules | 10 +++++----- etc/{csc => }/accounts.cf | 0 etc/{csc => }/members.cf | 0 {py => pylib}/csc/__init__.py | 0 {py/csc/admin => pylib/csc/adm}/__init__.py | 0 {py/csc/admin => pylib/csc/adm}/accounts.py | 4 ++-- {py/csc/admin => pylib/csc/adm}/members.py | 6 +++--- {py/csc/admin => pylib/csc/adm}/terms.py | 0 {py => pylib}/csc/apps/__init__.py | 0 {py => pylib}/csc/apps/legacy/__init__.py | 0 {py => pylib}/csc/apps/legacy/helpers.py | 0 {py => pylib}/csc/apps/legacy/main.py | 2 +- {py/csc/backend => pylib/csc/backends}/__init__.py | 0 {py/csc/backend => pylib/csc/backends}/db.py | 0 {py/csc/backend => pylib/csc/backends}/ipc.py | 0 {py/csc/backend => pylib/csc/backends}/krb.py | 0 {py/csc/backend => pylib/csc/backends}/ldapi.py | 0 pylib/csc/common/__init__.py | 3 +++ py/csc/lib/__init__.py => pylib/csc/common/conf.py | 0 19 files changed, 14 insertions(+), 11 deletions(-) rename etc/{csc => }/accounts.cf (100%) rename etc/{csc => }/members.cf (100%) rename {py => pylib}/csc/__init__.py (100%) rename {py/csc/admin => pylib/csc/adm}/__init__.py (100%) rename {py/csc/admin => pylib/csc/adm}/accounts.py (98%) rename {py/csc/admin => pylib/csc/adm}/members.py (99%) rename {py/csc/admin => pylib/csc/adm}/terms.py (100%) rename {py => pylib}/csc/apps/__init__.py (100%) rename {py => pylib}/csc/apps/legacy/__init__.py (100%) rename {py => pylib}/csc/apps/legacy/helpers.py (100%) rename {py => pylib}/csc/apps/legacy/main.py (99%) rename {py/csc/backend => pylib/csc/backends}/__init__.py (100%) rename {py/csc/backend => pylib/csc/backends}/db.py (100%) rename {py/csc/backend => pylib/csc/backends}/ipc.py (100%) rename {py/csc/backend => pylib/csc/backends}/krb.py (100%) rename {py/csc/backend => pylib/csc/backends}/ldapi.py (100%) create mode 100644 pylib/csc/common/__init__.py rename py/csc/lib/__init__.py => pylib/csc/common/conf.py (100%) diff --git a/debian/rules b/debian/rules index b69af8d..2009af7 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ clean: dh_clean rm -f build-stamp rm -rf build/ - find py/ -name '*.pyc' -print0 | xargs -0 rm -f + find pylib/ -name '*.pyc' -print0 | xargs -0 rm -f install: build dh_testdir @@ -25,12 +25,12 @@ install: build dh_clean -k # configuration files will contain sensitive information - chmod 600 etc/csc/* + chmod 600 etc/* - dh_installdirs etc usr/lib/$(PYTHON)/site-packages usr/share/csc \ + dh_installdirs etc/csc usr/lib/$(PYTHON)/site-packages usr/share/csc \ usr/lib/csc usr/bin - dh_install -X.svn -X.pyc py/csc usr/lib/$(PYTHON)/site-packages/ - dh_install -X.svn -X.pyc etc/csc etc/ + dh_install -X.svn -X.pyc pylib/csc usr/lib/$(PYTHON)/site-packages/ + dh_install -X.svn -X.pyc etc/* etc/csc/ dh_install -X.svn -X.pyc sql/* usr/share/csc/ dh_install -X.svn -X.pyc bin/ceo usr/lib/csc/ diff --git a/etc/csc/accounts.cf b/etc/accounts.cf similarity index 100% rename from etc/csc/accounts.cf rename to etc/accounts.cf diff --git a/etc/csc/members.cf b/etc/members.cf similarity index 100% rename from etc/csc/members.cf rename to etc/members.cf diff --git a/py/csc/__init__.py b/pylib/csc/__init__.py similarity index 100% rename from py/csc/__init__.py rename to pylib/csc/__init__.py diff --git a/py/csc/admin/__init__.py b/pylib/csc/adm/__init__.py similarity index 100% rename from py/csc/admin/__init__.py rename to pylib/csc/adm/__init__.py diff --git a/py/csc/admin/accounts.py b/pylib/csc/adm/accounts.py similarity index 98% rename from py/csc/admin/accounts.py rename to pylib/csc/adm/accounts.py index d9975f3..3586461 100644 --- a/py/csc/admin/accounts.py +++ b/pylib/csc/adm/accounts.py @@ -1,8 +1,8 @@ # $Id: accounts.py 44 2006-12-31 07:09:27Z mspang $ # UNIX Accounts Module import re -from csc.backend import ldapi, krb -from csc.lib import read_config +from csc.backends import ldapi, krb +from csc.common.conf import read_config CONFIG_FILE = '/etc/csc/accounts.cf' diff --git a/py/csc/admin/members.py b/pylib/csc/adm/members.py similarity index 99% rename from py/csc/admin/members.py rename to pylib/csc/adm/members.py index 326a7de..405ec29 100644 --- a/py/csc/admin/members.py +++ b/pylib/csc/adm/members.py @@ -12,9 +12,9 @@ must also be moved into this module. """ import re -from csc.admin import terms -from csc.backend import db -from csc.lib import read_config +from csc.adm import terms +from csc.backends import db +from csc.common.conf import read_config diff --git a/py/csc/admin/terms.py b/pylib/csc/adm/terms.py similarity index 100% rename from py/csc/admin/terms.py rename to pylib/csc/adm/terms.py diff --git a/py/csc/apps/__init__.py b/pylib/csc/apps/__init__.py similarity index 100% rename from py/csc/apps/__init__.py rename to pylib/csc/apps/__init__.py diff --git a/py/csc/apps/legacy/__init__.py b/pylib/csc/apps/legacy/__init__.py similarity index 100% rename from py/csc/apps/legacy/__init__.py rename to pylib/csc/apps/legacy/__init__.py diff --git a/py/csc/apps/legacy/helpers.py b/pylib/csc/apps/legacy/helpers.py similarity index 100% rename from py/csc/apps/legacy/helpers.py rename to pylib/csc/apps/legacy/helpers.py diff --git a/py/csc/apps/legacy/main.py b/pylib/csc/apps/legacy/main.py similarity index 99% rename from py/csc/apps/legacy/main.py rename to pylib/csc/apps/legacy/main.py index a55e46c..736d55b 100644 --- a/py/csc/apps/legacy/main.py +++ b/pylib/csc/apps/legacy/main.py @@ -12,7 +12,7 @@ This frontend is poorly documented, deprecated, and undoubtedly full of bugs. """ import curses.ascii, re, os from helpers import menu, inputbox, msgbox, reset -from csc.admin import accounts, members, terms +from csc.adm import accounts, members, terms # color of the ceo border BORDER_COLOR = curses.COLOR_RED diff --git a/py/csc/backend/__init__.py b/pylib/csc/backends/__init__.py similarity index 100% rename from py/csc/backend/__init__.py rename to pylib/csc/backends/__init__.py diff --git a/py/csc/backend/db.py b/pylib/csc/backends/db.py similarity index 100% rename from py/csc/backend/db.py rename to pylib/csc/backends/db.py diff --git a/py/csc/backend/ipc.py b/pylib/csc/backends/ipc.py similarity index 100% rename from py/csc/backend/ipc.py rename to pylib/csc/backends/ipc.py diff --git a/py/csc/backend/krb.py b/pylib/csc/backends/krb.py similarity index 100% rename from py/csc/backend/krb.py rename to pylib/csc/backends/krb.py diff --git a/py/csc/backend/ldapi.py b/pylib/csc/backends/ldapi.py similarity index 100% rename from py/csc/backend/ldapi.py rename to pylib/csc/backends/ldapi.py diff --git a/pylib/csc/common/__init__.py b/pylib/csc/common/__init__.py new file mode 100644 index 0000000..7369902 --- /dev/null +++ b/pylib/csc/common/__init__.py @@ -0,0 +1,3 @@ +""" +Generally Useful Common Modules +""" diff --git a/py/csc/lib/__init__.py b/pylib/csc/common/conf.py similarity index 100% rename from py/csc/lib/__init__.py rename to pylib/csc/common/conf.py