[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at v0.0.3-18-ga195fdb

[Michael DeHaan]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  a195fdbbdf58091e711da881d3f6d152a14558f9 (commit)
      from  6c2f653db52987363b99e2a5e5a9d488dbf4d48a (commit)

- Log -----------------------------------------------------------------
commit a195fdbbdf58091e711da881d3f6d152a14558f9
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Wed Jul 4 12:31:42 2007 -0400

    Further work on RPMs and vf_migrate script to make them work in the new location.
-----------------------------------------------------------------------

Diffstat:
 service/migrate/__init__.py |    2 +-
 service/scripts/vf_migrate  |    2 +-
 service/setup.py            |   14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/service/migrate/__init__.py b/service/migrate/__init__.py
index 61209bb..d6ea2ca 100644
--- a/service/migrate/__init__.py
+++ b/service/migrate/__init__.py
@@ -1 +1 @@
-from server.migratelib.run import *
+from server.migrate.run import *
diff --git a/service/scripts/vf_migrate b/service/scripts/vf_migrate
index d52707b..43a42f7 100755
--- a/service/scripts/vf_migrate
+++ b/service/scripts/vf_migrate
@@ -7,6 +7,6 @@ import distutils.sysconfig
 sys.path.append("%s/virt-factory" % distutils.sysconfig.get_python_lib())
 sys.path.append("%s/virt-factory/server" % distutils.sysconfig.get_python_lib())
 
-from server.migratelib.versioning.shell import main
+from server.migrate.versioning.shell import main
 
 main()
diff --git a/service/setup.py b/service/setup.py
index 929d2a0..eaa6380 100644
--- a/service/setup.py
+++ b/service/setup.py
@@ -2,6 +2,7 @@
 
 import sys
 from distutils.core import setup, Extension
+#from setuptools import setup,find_packages
 import string
 import glob
 
@@ -12,7 +13,9 @@ LONG_DESC = """
 A small pluggabe xml-rpc daemon used by %s to implement various web services hooks
 """ % NAME
 
+
 if __name__ == "__main__":
+ 
         manpath    = "share/man/man1/"
         etcpath    = "/etc/%s" % NAME
         etcpathdb  = "/etc/%s/db" % NAME
@@ -49,7 +52,8 @@ if __name__ == "__main__":
                            "db/vf_create_db",
                            "scripts/vf_migrate"
                 ],
-		package_dir = {"%s" % NAME: "",
+		# package_data = { '' : ['*.*'] },
+                package_dir = {"%s" % NAME: "",
 			       "%s/server" % NAME: "server",
 			       "%s/server/modules" % NAME: "modules/",
 			       "%s/server/db_upgrade" % NAME: "db_upgrade/",
@@ -67,10 +71,10 @@ if __name__ == "__main__":
                                "%s/server/migrate/versioning/templates/script" % NAME: "migrate/versioning/templates/script/"
                 },
 		packages = ["%s" % NAME,
-			    "%s/server" % NAME,
-			    "%s/server/modules" % NAME,
-			    "%s/server/db_upgrade" % NAME,
-			    "%s/server/yaml" % NAME,
+	        	    "%s/server" % NAME,
+	        	    "%s/server/modules" % NAME,
+	  	 	    "%s/server/db_upgrade" % NAME,
+	 	            "%s/server/yaml" % NAME,
                             "%s/server/migrate" % NAME,
                             "%s/server/migrate/changeset" % NAME,
                             "%s/server/migrate/changeset/databases" % NAME,

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  6c2f653db52987363b99e2a5e5a9d488dbf4d48a \
  a195fdbbdf58091e711da881d3f6d152a14558f9