From a0ce0340d0f95514008cfac751fe58748bbadd88 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 20 Mar 2008 00:04:16 +0000 Subject: * 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 --- installer/OpenSLX/OSSetup/Packager/dpkg.pm | 102 ++++++++++++++--------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'installer/OpenSLX/OSSetup/Packager/dpkg.pm') 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; -- cgit v1.2.3-55-g7522