prototypes: Use common aptitude install function

This lets the prototypes use a common function to install packages
through aptitude.

1 files changed, 7 insertions, 8 deletions

diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py
index 32b1353..6a0b0f5 100644
--- a/rumba/prototypes/irati.py
+++ b/rumba/prototypes/irati.py
@@ -81,19 +81,18 @@ class Experiment(mod.Experiment):
 
     def install(self):
         """Installs IRATI on the nodes."""
-        cmds = [self.sudo("while fuser /var/lib/dpkg/lock > /dev/null 2>&1 " +
-                          "do sleep 1; echo \"Waiting for dpkg...\"; done"),
-                self.sudo("apt-get update"),
-                self.sudo("apt-get install g++ gcc libtool "
-                          "linux-headers-$(uname -r) autoconf automake "
-                          "protobuf-compiler libprotobuf-dev "
-                          "git pkg-config libssl-dev --yes"),
-                self.sudo("rm -rf ~/stack"),
+
+        packages = ["g++", "gcc", "libtool", "linux-headers-$(uname -r)",
+                    "autoconf", "automake", "protobuf-compiler",
+                    "libprotobuf-dev", "git", "pkg-config", "libssl-dev"]
+
+        cmds = [self.sudo("rm -rf ~/stack"),
                 "cd ~; git clone -b arcfire https://github.com/IRATI/stack",
                 "cd ~/stack && "
                 + self.sudo("./configure && ") + self.sudo("make install")]
 
         for node in self.nodes:
+            ssh.aptitude_install(self.testbed, node, packages)
             ssh.execute_proxy_commands(self.testbed, node.ssh_config,
                                        cmds, time_out=None)