From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 22 Jun 2011 09:25:15 +0000 (+0200)
Subject: manage .pkg
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0a39ae5db87fce375cbe539d698c55f84a40502f;p=infrastructure.git

manage .pkg
---

diff --git a/scripts/vserver_tools.py b/scripts/vserver_tools.py
index 8a9447f..cdc4715 100755
--- a/scripts/vserver_tools.py
+++ b/scripts/vserver_tools.py
@@ -341,27 +341,28 @@ class Vserver:
         result=True
         if currently_running:
             result = result and self.stop()
-        result = result \
-            and e2b(ssh.run("mv /vservers/%(oldname)s /vservers/%(newname)s"%locals(),
-                            message="tweaking /vservers/<>")) \
-            and e2b(ssh.run("mv /etc/vservers/%(oldname)s /etc/vservers/%(newname)s"%locals(),
-                            message="tweaking /etc/vservers/<>")) \
-            and e2b(ssh.run("rm /etc/vservers/%(newname)s/run"%locals(),
-                            message="cleaning /etc/vservers/<>/run")) \
-            and e2b(ssh.run("ln -s /var/run/vservers/%(newname)s /etc/vservers/%(newname)s/run"%locals(),
-                            message="adjusting /etc/vservers/<>/run")) \
-            and e2b(ssh.run("rm /etc/vservers/%(newname)s/vdir"%locals(),
-                            message="cleaning /etc/vservers/<>/vdir")) \
-            and e2b(ssh.run("ln -s /etc/vservers/.defaults/vdirbase/%(newname)s /etc/vservers/%(newname)s/vdir"%locals(),
-                            message="adjusting /etc/vservers/<>/vdir")) \
-            and e2b(ssh.run("rm /etc/vservers/%(newname)s/cache"%locals(),
-                            message="cleaning /etc/vservers/<>/cache")) \
-            and e2b(ssh.run("ln -s /etc/vservers/.defaults/cachebase/%(newname)s /etc/vservers/%(newname)s/cache"%locals(),
-                            message="adjusting /etc/vservers/<>/cache")) \
-            and e2b(ssh.run("rm /var/run/vservers.rev/%(xid)s"%locals(),
-                            message="cleaning /var/run/vservers.rev/<>")) \
-            and e2b(ssh.run("ln -s /etc/vserver/%(newname)s /var/run/vservers.rev/%(xid)s"%locals(),
-                            message="adjusting /var/run/vservers.rev/<>")) 
+        result = result and e2b(ssh.run("mv /vservers/%(oldname)s /vservers/%(newname)s"%locals(),
+                                        message="tweaking /vservers/<>"))
+        result = result and e2b(ssh.run("mv /etc/vservers/%(oldname)s /etc/vservers/%(newname)s"%locals(),
+                                        message="tweaking /etc/vservers/<>")) 
+        result = result and e2b(ssh.run("mv /vservers/.pkg/%(oldname)s /vservers/.pkg/%(newname)s"%locals(),
+                                        message="renaming /vservers/.pkg/<>")) 
+        result = result and e2b(ssh.run("rm /etc/vservers/%(newname)s/run"%locals(),
+                                        message="cleaning /etc/vservers/<>/run")) 
+        result = result and e2b(ssh.run("ln -s /var/run/vservers/%(newname)s /etc/vservers/%(newname)s/run"%locals(),
+                                        message="adjusting /etc/vservers/<>/run")) 
+        result = result and e2b(ssh.run("rm /etc/vservers/%(newname)s/vdir"%locals(),
+                                        message="cleaning /etc/vservers/<>/vdir")) 
+        result = result and e2b(ssh.run("ln -s /etc/vservers/.defaults/vdirbase/%(newname)s /etc/vservers/%(newname)s/vdir"%locals(),
+                                        message="adjusting /etc/vservers/<>/vdir")) 
+        result = result and e2b(ssh.run("rm /etc/vservers/%(newname)s/cache"%locals(),
+                                        message="cleaning /etc/vservers/<>/cache")) 
+        result = result and e2b(ssh.run("ln -s /etc/vservers/.defaults/cachebase/%(newname)s /etc/vservers/%(newname)s/cache"%locals(),
+                                        message="adjusting /etc/vservers/<>/cache")) 
+        result = result and e2b(ssh.run("rm /var/run/vservers.rev/%(xid)s"%locals(),
+                                        message="cleaning /var/run/vservers.rev/<>")) 
+        result = result and e2b(ssh.run("ln -s /etc/vservers/%(newname)s /var/run/vservers.rev/%(xid)s"%locals(),
+                                        message="adjusting /var/run/vservers.rev/<>")) 
 #        # refreshing target instance
         target=Vserver(newname,dry_run=self.dry_run,verbose=self.verbose)
         target.set_hostname(self.hostname)