diff options
author | Oliver Tappe | 2008-03-20 01:04:16 +0100 |
---|---|---|
committer | Oliver Tappe | 2008-03-20 01:04:16 +0100 |
commit | a0ce0340d0f95514008cfac751fe58748bbadd88 (patch) | |
tree | 844bb9e015f2fbcd83de54c3a63dd027b1218211 /installer/OpenSLX/OSSetup/Packager | |
parent | * fixed several bugs with respect to the listing of plugins (as part of a system (diff) | |
download | core-a0ce0340d0f95514008cfac751fe58748bbadd88.tar.gz core-a0ce0340d0f95514008cfac751fe58748bbadd88.tar.xz core-a0ce0340d0f95514008cfac751fe58748bbadd88.zip |
* Switched indent used in Perl-code and settings files from tabs to 4 spaces.
May need some manual corrections here and there, but should basically be ok.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1658 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup/Packager')
-rw-r--r-- | installer/OpenSLX/OSSetup/Packager/Base.pm | 14 | ||||
-rw-r--r-- | installer/OpenSLX/OSSetup/Packager/dpkg.pm | 102 | ||||
-rw-r--r-- | installer/OpenSLX/OSSetup/Packager/rpm.pm | 76 |
3 files changed, 96 insertions, 96 deletions
diff --git a/installer/OpenSLX/OSSetup/Packager/Base.pm b/installer/OpenSLX/OSSetup/Packager/Base.pm index 55211183..747ba7e4 100644 --- a/installer/OpenSLX/OSSetup/Packager/Base.pm +++ b/installer/OpenSLX/OSSetup/Packager/Base.pm @@ -9,14 +9,14 @@ # General information about OpenSLX can be found at http://openslx.org/ # ----------------------------------------------------------------------------- # Base.pm -# - provides empty base of the OpenSLX OSSetup::Packager API. +# - provides empty base of the OpenSLX OSSetup::Packager API. # ----------------------------------------------------------------------------- package OpenSLX::OSSetup::Packager::Base; use strict; use warnings; -our $VERSION = 1.01; # API-version . implementation-version +our $VERSION = 1.01; # API-version . implementation-version use OpenSLX::Basics; @@ -25,16 +25,16 @@ use OpenSLX::Basics; ################################################################################ sub new { - confess "Creating OpenSLX::OSSetup::Packager::Base-objects directly makes no sense!"; + confess "Creating OpenSLX::OSSetup::Packager::Base-objects directly makes no sense!"; } sub initialize { - my $self = shift; - my $engine = shift; + my $self = shift; + my $engine = shift; - $self->{'engine'} = $engine; - return; + $self->{'engine'} = $engine; + return; } sub prepareBootstrap diff --git a/installer/OpenSLX/OSSetup/Packager/dpkg.pm b/installer/OpenSLX/OSSetup/Packager/dpkg.pm index 573c2054..94aff9c6 100644 --- a/installer/OpenSLX/OSSetup/Packager/dpkg.pm +++ b/installer/OpenSLX/OSSetup/Packager/dpkg.pm @@ -9,7 +9,7 @@ # General information about OpenSLX can be found at http://openslx.org/ # ----------------------------------------------------------------------------- # rpm.pm -# - provides rpm-specific overrides of the OpenSLX::OSSetup::Packager API. +# - provides rpm-specific overrides of the OpenSLX::OSSetup::Packager API. # ----------------------------------------------------------------------------- package OpenSLX::OSSetup::Packager::dpkg; @@ -26,77 +26,77 @@ use OpenSLX::Utils; ################################################################################ sub new { - my $class = shift; - my $self = { - 'name' => 'dpkg', - }; - return bless $self, $class; + my $class = shift; + my $self = { + 'name' => 'dpkg', + }; + return bless $self, $class; } sub prepareBootstrap { - my $self = shift; - my $stage1aDir = shift; - - copyBinaryWithRequiredLibs({ - 'binary' => '/usr/bin/perl', - 'targetFolder' => "$stage1aDir/usr/bin", - 'libTargetFolder' => $stage1aDir, - }); + my $self = shift; + my $stage1aDir = shift; + + copyBinaryWithRequiredLibs({ + 'binary' => '/usr/bin/perl', + 'targetFolder' => "$stage1aDir/usr/bin", + 'libTargetFolder' => $stage1aDir, + }); } sub bootstrap { - my $self = shift; - my $pkgs = shift; + my $self = shift; + my $pkgs = shift; - my $debootstrapPkg = $pkgs->[0]; - chdir '..'; - vlog(2, "unpacking debootstrap ..."); - if (slxsystem("ash", "-c", "ar x slxbootstrap/$debootstrapPkg")) { - die _tr("unable to unarchive package '%s' (%s)", $debootstrapPkg, $!); - } - if (slxsystem("ash", "-c", "tar xzf data.tar.gz")) { - die _tr("unable to untar 'data.tar.gz (%s)", $!); - } - if (slxsystem("ash", "-c", "rm -f debian-binary *.tar.gz")) { - die _tr("unable to cleanup package '%s' (%s)", $debootstrapPkg, $!); - } - my $arch = $self->{engine}->{'distro-info'}->{arch}; - my $releaseName = $self->{engine}->{'distro-info'}->{'release-name'}; - my $baseURL = $self->{engine}->{baseURLs}->[0]; - my $debootstrapCmd = unshiftHereDoc(<<" END-OF-HERE"); - /usr/sbin/debootstrap --arch $arch $releaseName \\ - /slxbootstrap/slxfinal $baseURL - END-OF-HERE - if (slxsystem("ash", "-c", ". $debootstrapCmd")) { - die _tr("unable to run debootstrap (%s)", $!); - } - return; + my $debootstrapPkg = $pkgs->[0]; + chdir '..'; + vlog(2, "unpacking debootstrap ..."); + if (slxsystem("ash", "-c", "ar x slxbootstrap/$debootstrapPkg")) { + die _tr("unable to unarchive package '%s' (%s)", $debootstrapPkg, $!); + } + if (slxsystem("ash", "-c", "tar xzf data.tar.gz")) { + die _tr("unable to untar 'data.tar.gz (%s)", $!); + } + if (slxsystem("ash", "-c", "rm -f debian-binary *.tar.gz")) { + die _tr("unable to cleanup package '%s' (%s)", $debootstrapPkg, $!); + } + my $arch = $self->{engine}->{'distro-info'}->{arch}; + my $releaseName = $self->{engine}->{'distro-info'}->{'release-name'}; + my $baseURL = $self->{engine}->{baseURLs}->[0]; + my $debootstrapCmd = unshiftHereDoc(<<" END-OF-HERE"); + /usr/sbin/debootstrap --arch $arch $releaseName \\ + /slxbootstrap/slxfinal $baseURL + END-OF-HERE + if (slxsystem("ash", "-c", ". $debootstrapCmd")) { + die _tr("unable to run debootstrap (%s)", $!); + } + return; } sub installPackages { - my $self = shift; - my $pkgs = shift; - my $finalPath = shift; + my $self = shift; + my $pkgs = shift; + my $finalPath = shift; - return unless defined $pkgs && @$pkgs; + return unless defined $pkgs && @$pkgs; - if (slxsystem("dpkg", "--root=$finalPath", "--install", @$pkgs)) { - die _tr("error during package-installation (%s)\n", $!); - } - return; + if (slxsystem("dpkg", "--root=$finalPath", "--install", @$pkgs)) { + die _tr("error during package-installation (%s)\n", $!); + } + return; } sub getInstalledPackages { - my $self = shift; + my $self = shift; - my $rpmCmd = 'dpkg-query --showformat "\${package}\n" --show'; - my $pkgList = qx{$rpmCmd}; - return split "\n", $pkgList; + my $rpmCmd = 'dpkg-query --showformat "\${package}\n" --show'; + my $pkgList = qx{$rpmCmd}; + return split "\n", $pkgList; } 1; diff --git a/installer/OpenSLX/OSSetup/Packager/rpm.pm b/installer/OpenSLX/OSSetup/Packager/rpm.pm index db1e7e1f..8a86a3d2 100644 --- a/installer/OpenSLX/OSSetup/Packager/rpm.pm +++ b/installer/OpenSLX/OSSetup/Packager/rpm.pm @@ -9,7 +9,7 @@ # General information about OpenSLX can be found at http://openslx.org/ # ----------------------------------------------------------------------------- # rpm.pm -# - provides rpm-specific overrides of the OpenSLX::OSSetup::Packager API. +# - provides rpm-specific overrides of the OpenSLX::OSSetup::Packager API. # ----------------------------------------------------------------------------- package OpenSLX::OSSetup::Packager::rpm; @@ -25,65 +25,65 @@ use OpenSLX::Basics; ################################################################################ sub new { - my $class = shift; - my $self = { - 'name' => 'rpm', - }; - return bless $self, $class; + my $class = shift; + my $self = { + 'name' => 'rpm', + }; + return bless $self, $class; } sub bootstrap { - my $self = shift; - my $pkgs = shift; + my $self = shift; + my $pkgs = shift; - foreach my $pkg (@$pkgs) { - vlog(2, "unpacking package $pkg..."); - if (slxsystem("ash", "-c", "rpm2cpio $pkg | cpio -i -d -u")) { - die _tr("unable to unpack package <%s> (%s)", $pkg, $!); - } - } - return; + foreach my $pkg (@$pkgs) { + vlog(2, "unpacking package $pkg..."); + if (slxsystem("ash", "-c", "rpm2cpio $pkg | cpio -i -d -u")) { + die _tr("unable to unpack package <%s> (%s)", $pkg, $!); + } + } + return; } sub importTrustedPackageKeys { - my $self = shift; - my $keyFiles = shift; - my $finalPath = shift; + my $self = shift; + my $keyFiles = shift; + my $finalPath = shift; - return unless defined $keyFiles; + return unless defined $keyFiles; - foreach my $keyFile (@$keyFiles) { - vlog(2, "importing package key $keyFile..."); - if (slxsystem("rpm", "--root=$finalPath", "--import", "$keyFile")) { - die _tr("unable to import package key <%s> (%s)\n", $keyFile, $!); - } - } - return; + foreach my $keyFile (@$keyFiles) { + vlog(2, "importing package key $keyFile..."); + if (slxsystem("rpm", "--root=$finalPath", "--import", "$keyFile")) { + die _tr("unable to import package key <%s> (%s)\n", $keyFile, $!); + } + } + return; } sub installPackages { - my $self = shift; - my $pkgs = shift; - my $finalPath = shift; + my $self = shift; + my $pkgs = shift; + my $finalPath = shift; - return unless defined $pkgs && scalar(@$pkgs); + return unless defined $pkgs && scalar(@$pkgs); - if (slxsystem("rpm", "--root=$finalPath", "-ivh", @$pkgs)) { - die _tr("error during package-installation (%s)\n", $!); - } - return; + if (slxsystem("rpm", "--root=$finalPath", "-ivh", @$pkgs)) { + die _tr("error during package-installation (%s)\n", $!); + } + return; } sub getInstalledPackages { - my $self = shift; + my $self = shift; - my $rpmCmd = 'rpm -qa --queryformat="%{NAME}\n"'; - my $pkgList = `$rpmCmd`; - return split "\n", $pkgList; + my $rpmCmd = 'rpm -qa --queryformat="%{NAME}\n"'; + my $pkgList = `$rpmCmd`; + return split "\n", $pkgList; } 1; |