Changeset 2766 for trunk

Timestamp:

Dec 21, 2009, 5:30:11 PM (15 years ago)

Author:

broder

Message:

Have authz providers use an invirt.authz module.

xvm-authz-locker now includes an invirt.authz module instead of
xvm.authz.locker. All authz providers conflict with each other, and
provide invirt-authz.

Location:

trunk/packages

Files:

• invirt-base/debian/changelog (modified) (1 diff)
• invirt-base/python/invirt/authz (deleted)
• invirt-dev/invirt-build-conf (modified) (1 diff)
• xvm-authz-locker/debian/changelog (modified) (1 diff)
• xvm-authz-locker/debian/control (modified) (1 diff)
• xvm-authz-locker/python/invirt (added)
• xvm-authz-locker/python/invirt/authz.py (copied) (copied from trunk/packages/xvm-authz-locker/python/xvm/authz/locker.py)
• xvm-authz-locker/python/xvm (deleted)
• xvm-authz-locker/setup.py (modified) (2 diffs)

trunk/packages/invirt-base/debian/changelog

@@ +1 @@
+invirt-base (0.0.28) unstable; urgency=low
+
+  * Completely remove the invirt.authz Python package - it will be
+    included in packages that Provide invirt-authz.
+
+ -- Evan Broder <broder@mit.edu>  Mon, 21 Dec 2009 16:26:21 -0600
+
 invirt-base (0.0.27) unstable; urgency=low
 

trunk/packages/invirt-dev/invirt-build-conf

@@ -12 +12 @@
 import tempfile
 
-from invirt.authz import mech as authz
+from invirt import authz
 from invirt import builder
 from invirt.config import structs as config

trunk/packages/xvm-authz-locker/debian/changelog

@@ +1 @@
+xvm-authz-locker (0.0.2) unstable; urgency=low
+
+  * Install the authz module as invirt.authz, instead of xvm.authz.locker
+
+ -- Evan Broder <broder@mit.edu>  Mon, 21 Dec 2009 16:24:05 -0600
+
 xvm-authz-locker (0.0.1) unstable; urgency=low
 

trunk/packages/xvm-authz-locker/debian/control

@@ -10 +10 @@
 Depends: ${python:Depends}, ${misc:Depends}, invirt-base, python-afs
 Provides: ${python:Provides}, invirt-authz
+Conflicts: invirt-authz
+Replaces: invirt-authz
 XB-Python-Version: ${python:Versions}
 Description: Authorization module for XVM

trunk/packages/xvm-authz-locker/setup.py

@@ -4 +4 @@
 from email.utils import parseaddr
 from glob import glob
-from setuptools import setup, find_packages
+from setuptools import setup
 
 try:
@@ -24 +24 @@
     maintainer_email=maintainer_email,
     
-    packages=find_packages('python'),
+    py_modules = ['invirt.authz'],
     package_dir = {'': 'python'},
 )