Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --git a/onelab-k22-tags.mk b/onelab-k22-tags.mk
index 733783c..d1cf3bb 100644 (file)
--- a/onelab-k22-tags.mk
+++ b/onelab-k22-tags.mk
@@ -21,7 +21,7 @@ util-vserver-pl-BRANCH                := 0.3
 util-vserver-pl-GITPATH                := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.3-32
 nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-7
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-27
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-28
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.onelab.eu/codemux.git@codemux-0.1-15
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@ -31,9 +31,9 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-1
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-27
-plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-28
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-29
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-59
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-60
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -48,12 +48,12 @@ oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.5.1-1
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-13
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-4
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-16
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-9
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-8
 vserver-reference-GITPATH       := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6
-bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-9
+bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-10
 myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-15
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 0b526d4..80a9188 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -20,7 +20,7 @@ libnl-SVNPATH                 := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-22
 nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-7
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-27
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-28
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.onelab.eu/codemux.git@codemux-0.1-15
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@ -30,9 +30,9 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-1
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-27
-plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-28
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-29
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-59
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-60
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -47,12 +47,12 @@ oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.5.1-1
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-13
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-4
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-16
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-9
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-8
 vserver-reference-GITPATH        := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6
-bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-9
+bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-10
 myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-15
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index ea4a74f..5fdd3c6 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -12,7 +12,7 @@ libnl-SVNPATH                 := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-22
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-7
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-27
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-28
 # Trellis-specific NodeManager plugins
 NodeManager-topo-SVNPATH       := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
@@ -26,9 +26,9 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH                    := git://git.planet-lab.org/openvswitch.git
 vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-27
-plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-28
+plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-29
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-59
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-60
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
@@ -44,10 +44,10 @@ pypcilib-GITPATH            := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-9
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-10
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-16
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-17
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-8
 vserver-reference-GITPATH       := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-6
-bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-9
+bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-10
 myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-15
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-23

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 0e56fe2..b337807 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -19,7 +19,7 @@ libnl-SVNPATH                 := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-GITPATH                := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-22
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-7
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-27
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-28
 # Trellis-specific NodeManager plugins
 NodeManager-topo-SVNPATH       := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
@@ -33,9 +33,9 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH                    := git://git.planet-lab.org/openvswitch.git
 vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-27
-plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-28
+plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-29
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-59
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-60
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
@@ -47,14 +47,14 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-9
 ###
 sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-13
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-16
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-17
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-9
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-10
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-8
 vserver-reference-GITPATH       := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-6
-bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-9
+bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-10
 myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-15
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-23

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 1695178..ae66b77 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -16,7 +16,7 @@ util-vserver-pl-GITPATH               := git://git.planet-lab.org/util-vserver-pl.git@util-vs
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-7
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-27
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-28
 codemux-GITPATH                        := git://git.planet-lab.org/codemux.git@codemux-0.1-15
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
@@ -25,9 +25,9 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH                    := git://git.planet-lab.org/openvswitch.git
 vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-27
-plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-28
+plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-29
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-59
+plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-60
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-10
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
@@ -40,12 +40,12 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-9
 ###
 sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-13
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-16
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-17
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-9
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-8
 vserver-reference-GITPATH       := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-6
-bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-9
+bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-10
 myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-15
 DistributedRateLimiting-SVNPATH                        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 

diff --git a/spec2make.c b/spec2make.c
index fc5dd6f..bcc4919 100644 (file)
--- a/spec2make.c
+++ b/spec2make.c
@@ -94,47 +94,47 @@ main(int argc, char *argv[])
 
   /* walk argv list looking for options */
   while ((args+1)<argc) {
-    /* whitelist-rpms are packages that need to be considered even if the parsing logic of spec2make (second half of this file) concludes otherwise */
-    if (strcmp(argv[args],"--whitelist-rpms")==0) {
-       /* Split "whitelist-rpms" which is a comma-separated list, remove --whitelist-rpms <option> from argv */
+      /* whitelist-rpms are packages that need to be considered even if the parsing logic of spec2make (second half of this file) concludes otherwise */
+      if (strcmp(argv[args],"--whitelist-rpms")==0) {
+          /* Split "whitelist-rpms" which is a comma-separated list, remove --whitelist-rpms <option> from argv */
 
-       int option_offset = 1; 
-       char *whitelist_str = argv[args+1];
-       if (whitelist_str != NULL) {
-               char *saveptr = NULL, *str;
-               option_offset = 2;
-               for (str = whitelist_str; ; str = NULL) {
-                  char *token;
-                   token = strtok_r(str, "," , &saveptr);
-                  if (token == NULL) break;
-                  package_whitelist[whitelist_size++] = token;
-               }       
-       }
-       for (i=args;i<argc-2+option_offset;i++) argv[i]=argv[i+option_offset];
-       argc-=option_offset;
-       
-    } else if (strcmp(argv[args],"--target")==0) {
-      char **dash;
+          int option_offset = 1; 
+          char *whitelist_str = argv[args+1];
+          if (whitelist_str != NULL) {
+              char *saveptr = NULL, *str;
+              option_offset = 2;
+              for (str = whitelist_str; ; str = NULL) {
+                  char *token;
+                  token = strtok_r(str, "," , &saveptr);
+                  if (token == NULL) break;
+                  package_whitelist[whitelist_size++] = token;
+              }        
+          }
+          for (i=args;i<argc-2+option_offset;i++) argv[i]=argv[i+option_offset];
+          argc-=option_offset;
 
-      /* get arch component of the --target option */
-      dash = (char**)strchr(argv[args+1],'-');
-      if (dash != NULL) *dash=NULL;
+      } else if (strcmp(argv[args],"--target")==0) {
+          char **dash;
 
-      /* copy arch component of --target option to target */
-      alen = strnlen(argv[args+1],32);
-      target = (char*)malloc(alen+1);
-      if (target == NULL) return errno;
-      strncpy(target,argv[args+1],alen);
-      target[alen]='\0';
+          /* get arch component of the --target option */
+          dash = (char**)strchr(argv[args+1],'-');
+          if (dash != NULL) *dash=NULL;
 
-      /* change argc, argv to take out the "--target xxx" */
-      for (i=args;i<argc;i++) argv[i]=argv[i+2];
-      argc-=2;
+          /* copy arch component of --target option to target */
+          alen = strnlen(argv[args+1],32);
+          target = (char*)malloc(alen+1);
+          if (target == NULL) return errno;
+          strncpy(target,argv[args+1],alen);
+          target[alen]='\0';
 
-      break;
-    }
+          /* change argc, argv to take out the "--target xxx" */
+          for (i=args;i<argc;i++) argv[i]=argv[i+2];
+          argc-=2;
 
-    args++;
+          break;
+      }
+      else
+          args++;
   }
   argv[1]=argv[argc-2];
   argv[2]=argv[argc-1];

diff --git a/trellis-tags.mk b/trellis-tags.mk
index c89a56c..bdd84b7 100644 (file)
--- a/trellis-tags.mk
+++ b/trellis-tags.mk
@@ -31,7 +31,7 @@ vsys-GITPATH                  := git://git.onelab.eu/vsys@vsys-0.9-4
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-24
 PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-PLEWWW-GITPATH                  := git://git.onelab.eu/plewww@plewww-4.3-59
+PLEWWW-GITPATH                  := git://git.onelab.eu/plewww@plewww-4.3-60
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/
 pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-4/