diff options
| author | Oliver Tappe | 2007-03-12 17:06:02 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2007-03-12 17:06:02 +0100 |
| commit | 116a029c4b23d45dc541053871a675c65b24d4c4 (patch) | |
| tree | 24be02b7beee35166dd30b6456ff7b0eb97cc08a /installer/OpenSLX/OSSetup/Engine.pm | |
| parent | * when cloning, we now only apply the common filter, the distro-specific filt... (diff) | |
| download | core-116a029c4b23d45dc541053871a675c65b24d4c4.tar.gz core-116a029c4b23d45dc541053871a675c65b24d4c4.tar.xz core-116a029c4b23d45dc541053871a675c65b24d4c4.zip | |
* fixed a syntax typo
* minor cleanups
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@754 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup/Engine.pm')
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index add46c8d..85159ff2 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -1,4 +1,4 @@ -# Engine.pm - provides driver enginge for the OSSetup API. +# Engine.pm - provides driver engine for the OSSetup API. # # (c) 2006 - OpenSLX.com # @@ -95,7 +95,7 @@ sub initialize # load module for the requested distro: my $distroModule = "OpenSLX::OSSetup::Distro::" - .$supportedDistros{lc($distroName)->{module}}; + .$supportedDistros{lc($distroName)}->{module}; unless (eval "require $distroModule") { if ($! == 2) { die _tr("Distro-module <%s> not found!\n", $distroModule); @@ -693,13 +693,14 @@ sub clone_fetchSource my $filterFile = "../lib/distro-info/clone-filter-common"; if (open(FILTER, "< $filterFile")) { while(<FILTER>) { + chomp; push @includeList, $_ if /^\+\s+/; push @excludeList, $_ if /^\-\s+/; } close(FILTER); } - my $excludeIncludeList = join("", @includeList, @excludeList); - vlog 1, "using exclude-include-filter:\n$excludeIncludeList\n"; + my $excludeIncludeList = join("\n", @includeList, @excludeList); + vlog 0, "using exclude-include-filter:\n$excludeIncludeList\n"; open(RSYNC, "| rsync -av --delete --exclude-from=- $source $self->{'system-path'}") or die _tr("unable to start rsync for source '%s', giving up! (%s)", $source, $!); |