From f5b489888d97083d8b2a3b8885c68684fbb642c8 Mon Sep 17 00:00:00 2001 From: Volker Uhrig Date: Mon, 20 Jul 2009 08:06:16 +0000 Subject: * fixed installation * still not working (with ubuntu) git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3025 95ad53e4-c205-0410-b2fa-d234c58c8868 --- os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm | 4 ++-- os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm | 2 +- os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm | 2 +- os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm | 10 ++-------- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm index 3b62c416..d26cdfcc 100644 --- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm @@ -37,7 +37,7 @@ sub new sub initialize { my $self = shift; - my $engine = shift; + $self->{engine} = shift; weaken($self->{engine}); # avoid circular reference between plugin and its engine @@ -48,7 +48,7 @@ sub installVbox { my $self = shift; - my $engine = $self->{'os-plugin-engine'}; + my $engine = $self->{'engine'}; # lets try it... we can't loose anything :) $engine->installPackages('virtualbox-ose'); diff --git a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm index eeb35e54..33581b83 100644 --- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm +++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm @@ -30,7 +30,7 @@ sub installVbox { my $self = shift; - my $engine = $self->{'os-plugin-engine'}; + my $engine = $self->{'engine'}; my $release = `lsb_release -rs`; chomp($release); diff --git a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm index 46dec675..fad96ea1 100644 --- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm @@ -30,7 +30,7 @@ sub installVbox { my $self = shift; - my $engine = $self->{'os-plugin-engine'}; + my $engine = $self->{'engine'}; my $release = `lsb_release -rs`; chomp($release); diff --git a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm index 35b851a2..3bb2735c 100644 --- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm @@ -32,19 +32,13 @@ sub installVbox { my $self = shift; - my $engine = $self->{'os-plugin-engine'}; + my $engine = $self->{'engine'}; my $release = `lsb_release -rs`; chomp($release); # hardy (8.04LTS): only version VBox v1.5 if ( $release eq "8.10" || $release eq "9.04") { - #$engine->installPackages("virtualbox-ose"); - for my $key ( keys %$self ) { - # we don't into this routine - print "DEBUG: $key\n"; - } - my $size = scalar(keys %$self); - print "Size: $size\n"; + $engine->installPackages("virtualbox-ose"); } else { print "Couldn't install VirtualBox, no package from distribution!\n"; exit; -- cgit v1.2.3-55-g7522