Use a full repo path so we can expand to include trunk/scripts later.

svn path=/trunk/scripts/git-migration/; revision=1895

diff --git a/git-migrate b/git-migrate
index ccd9934..053c9a9 100755 (executable)
--- a/git-migrate
+++ b/git-migrate
@@ -29,6 +29,9 @@ def tagBase(pkg):
                           cwd='%s.git' % pkg)
 
 def clonePackage(base, pkg):
+    path = '%s/%s' % (base, pkg)
+    pkg = os.path.basename(pkg)
+    
     if not os.path.isdir('%s.git' % pkg):
         if os.path.isdir(pkg):
             shutil.rmtree(pkg)
@@ -39,7 +42,7 @@ def clonePackage(base, pkg):
                                '-Aauthors',
                                '-q',
                                '--no-metadata',
-                               '%s/packages/%s' % (base, pkg)],
+                               '%s' % path],
                               stdout=subprocess.PIPE)
         
         # Then make the repository bare, because git-svn can't do this

diff --git a/package-list b/package-list
index ecbcd3f..e6e4028 100644 (file)
--- a/package-list
+++ b/package-list
@@ -1,52 +1,52 @@
-invirt-autoinstaller
-invirt-base
-invirt-cluster-config
-invirt-console
-invirt-console-host
-invirt-console-server
-invirt-database
-invirt-database-server
-invirt-dev
-invirt-dhcp
-invirt-dns
-invirt-host-master
-invirt-images
-invirt-remote
-invirt-remote-host
-invirt-remote-server
-invirt-svn-server
-invirt-vnc-client
-invirt-vnc-server
-invirt-web
-invirt-web-iptables
-invirt-xen-config
-libapache2-mod-auth-sslcert
-libyaml
-python-pydhcplib
-python-routefs
-pyyaml
-sipb-xen-autoinstaller
-sipb-xen-base
-sipb-xen-console
-sipb-xen-console-server
-sipb-xen-database
-sipb-xen-dev
-sipb-xen-dhcp
-sipb-xen-dns
-sipb-xen-dom0
-sipb-xen-guest-installer
-sipb-xen-host-master
-sipb-xen-iptables
-sipb-xen-python-pydhcplib
-sipb-xen-remctl-auto
-sipb-xen-remote-server
-sipb-xen-vnc-client
-sipb-xen-vnc-server
-sipb-xen-www
-xvm-db-backup
-xvm-devconfig
-xvm-iscsi-config
-xvm-mail-config
-xvm-meta
-xvm-munin-config
-xvm-prodconfig
+packages/invirt-autoinstaller
+packages/invirt-base
+packages/invirt-cluster-config
+packages/invirt-console
+packages/invirt-console-host
+packages/invirt-console-server
+packages/invirt-database
+packages/invirt-database-server
+packages/invirt-dev
+packages/invirt-dhcp
+packages/invirt-dns
+packages/invirt-host-master
+packages/invirt-images
+packages/invirt-remote
+packages/invirt-remote-host
+packages/invirt-remote-server
+packages/invirt-svn-server
+packages/invirt-vnc-client
+packages/invirt-vnc-server
+packages/invirt-web
+packages/invirt-web-iptables
+packages/invirt-xen-config
+packages/libapache2-mod-auth-sslcert
+packages/libyaml
+packages/python-pydhcplib
+packages/python-routefs
+packages/pyyaml
+packages/sipb-xen-autoinstaller
+packages/sipb-xen-base
+packages/sipb-xen-console
+packages/sipb-xen-console-server
+packages/sipb-xen-database
+packages/sipb-xen-dev
+packages/sipb-xen-dhcp
+packages/sipb-xen-dns
+packages/sipb-xen-dom0
+packages/sipb-xen-guest-installer
+packages/sipb-xen-host-master
+packages/sipb-xen-iptables
+packages/sipb-xen-python-pydhcplib
+packages/sipb-xen-remctl-auto
+packages/sipb-xen-remote-server
+packages/sipb-xen-vnc-client
+packages/sipb-xen-vnc-server
+packages/sipb-xen-www
+packages/xvm-db-backup
+packages/xvm-devconfig
+packages/xvm-iscsi-config
+packages/xvm-mail-config
+packages/xvm-meta
+packages/xvm-munin-config
+packages/xvm-prodconfig