* corrected assumption that rsync filters follow a best-match strategy to a first-match strategy

  and adjusted the default filter accordingly


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@767 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 93 insertions, 95 deletions

diff --git a/installer/OpenSLX/OSExport/Distro/SUSE_10_2.pm b/installer/OpenSLX/OSExport/Distro/SUSE_10_2.pm
index da3f0aaf..6c3fb07a 100644
--- a/installer/OpenSLX/OSExport/Distro/SUSE_10_2.pm
+++ b/installer/OpenSLX/OSExport/Distro/SUSE_10_2.pm
@@ -41,56 +41,56 @@ sub initDistroInfo
 	my $self = shift;
 
 	$self->{'export-filter'} = "
-		- *.YaST2save
-		- *.o
-		- *.rpmnew
-		- *.rpmsave
-		- /boot/grub
-		- /boot/initrd*
-		- /etc/X11/xdm/SuSEconfig.xdm
-		- /etc/cron.*/*
-		- /etc/dhcpd.conf*
-		+ /lib/modules/*/misc/vmmon.o
-		+ /lib/modules/*/misc/vmnet.o
-		+ /media
-		- /media/*
-		- /opt/kde3/share/autostart/SUSEgreeter.desktop
-		- /opt/kde3/share/autostart/beagled.desktop
-		- /opt/kde3/share/autostart/kerry.autostart.desktop
-		- /opt/kde3/share/autostart/knetworkmanager-autostart.desktop
-		- /opt/kde3/share/autostart/opensuseupdater.desktop
-		- /opt/kde3/share/autostart/profile_chooser-autostart.desktop
-		- /opt/kde3/share/autostart/runupdater.desktop
-		- /opt/kde3/share/autostart/suseplugger.desktop
-		- /usr/X11R6/bin/BackGround
-		- /usr/bin/nw-manager
-		- /usr/bin/zen-*
-		+ /usr/lib/*.o
-		+ /usr/lib/gcc/*/*/*.o
-		+ /usr/lib/perl5/*/*/*/*.o
-		+ /usr/lib/python*/*/*.o
-		- /usr/lib/zen-updater
-		- /usr/share/vmware/*
-		- /var/adm/SuSEconfig
-		- /var/adm/backup/rpmdb/*
-		- /var/cache/man/*
-		- /var/lib/YaST2/you/mnt/*
-		- /var/lib/dhcp*
-		- /var/lib/gdm/*
-		- /var/lib/hardware/*
-		- /var/lib/sax
-		- /var/lib/suspend*
-		- /var/lib/vm/*
-		- /var/lib/xdm
-		- /var/lib/zmd
-		- /var/lib/zypp/*
-		- /var/lib/zypp/cache/*
-		- /var/lock/*
-		- /var/log/*
-		- /var/mail
-		- /var/run/*
-		- /var/spool/*
 		- /var/tmp/*
+		- /var/spool/*
+		- /var/run/*
+		- /var/mail
+		- /var/log/*
+		- /var/lock/*
+		- /var/lib/zypp/cache/*
+		- /var/lib/zypp/*
+		- /var/lib/zmd
+		- /var/lib/xdm
+		- /var/lib/vm/*
+		- /var/lib/suspend*
+		- /var/lib/sax
+		- /var/lib/hardware/*
+		- /var/lib/gdm/*
+		- /var/lib/dhcp*
+		- /var/lib/YaST2/you/mnt/*
+		- /var/cache/man/*
+		- /var/adm/backup/rpmdb/*
+		- /var/adm/SuSEconfig
+		- /usr/share/vmware/*
+		- /usr/lib/zen-updater
+		+ /usr/lib/python*/*/*.o
+		+ /usr/lib/perl5/*/*/*/*.o
+		+ /usr/lib/gcc/*/*/*.o
+		+ /usr/lib/*.o
+		- /usr/bin/zen-*
+		- /usr/bin/nw-manager
+		- /usr/X11R6/bin/BackGround
+		- /opt/kde3/share/autostart/suseplugger.desktop
+		- /opt/kde3/share/autostart/runupdater.desktop
+		- /opt/kde3/share/autostart/profile_chooser-autostart.desktop
+		- /opt/kde3/share/autostart/opensuseupdater.desktop
+		- /opt/kde3/share/autostart/knetworkmanager-autostart.desktop
+		- /opt/kde3/share/autostart/kerry.autostart.desktop
+		- /opt/kde3/share/autostart/beagled.desktop
+		- /opt/kde3/share/autostart/SUSEgreeter.desktop
+		- /media/*
+		+ /media
+		+ /lib/modules/*/misc/vmnet.o
+		+ /lib/modules/*/misc/vmmon.o
+		- /etc/dhcpd.conf*
+		- /etc/cron.*/*
+		- /etc/X11/xdm/SuSEconfig.xdm
+		- /boot/initrd*
+		- /boot/grub
+		- *.rpmsave
+		- *.rpmnew
+		- *.o
+		- *.YaST2save
 	";
 }
 
diff --git a/installer/OpenSLX/OSExport/ExportType/NFS.pm b/installer/OpenSLX/OSExport/ExportType/NFS.pm
index 659318be..b5529502 100644
--- a/installer/OpenSLX/OSExport/ExportType/NFS.pm
+++ b/installer/OpenSLX/OSExport/ExportType/NFS.pm
@@ -74,11 +74,9 @@ sub determineIncludeExcludeList
 {
 	my $self = shift;
 
-	# Rsync uses a best (longest) match strategy. If there is more than one
-	# match with the same length, the first wins. This means that we have
-	# to mix the local specifications in front of the filterset given by
-	# the package (as the local filters should always overrule the vendor
-	# filters):
+	# Rsync uses a first match strategy, so we mix the local specifications
+	# in front of the filterset given by the package (as the local filters
+	# should always overrule the vendor filters):
 	my $distroName = $self->{engine}->{'distro-name'};
 	my $localFilterFile = "../lib/distro-info/$distroName/export-filter.local";
 	my $includeExcludeList = slurpFile($localFilterFile, 1);
diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index 493a7c67..ec3e1a24 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -54,48 +54,48 @@ sub initialize
 	];
 
 	$self->{'clone-filter'} = "
-		- *.bak
-		- *.old
-		- *lost+found*
-		- *~
-		- .*.cmd
-		- .svn
-		- /*
-		+ /bin
-		+ /boot
-		+ /dev
-		- /dev/*
-		+ /etc
-		- /etc/dxs
-		- /etc/exports*
-		- /etc/opt/openslx
-		- /etc/resolv.conf.*
-		- /etc/samba/secrets.tdb
-		- /etc/shadow*
-		- /etc/vmware/installer.sh
-		+ /home
-		- /home/*
-		+ /lib
-		+ /lib64
-		+ /mnt
-		- /mnt/*
-		+ /opt
-		- /opt/openslx
-		+ /proc
-		- /proc/*
-		+ /root
-		- /root/*
-		+ /sbin
-		+ /sys
-		- /sys/*
-		+ /tmp
-		- /tmp/*
-		+ /usr
-		- /usr/lib/vmware/modules/*
-		+ /var
-		- /var/lib/vmware
-		- /var/opt/openslx
 		- /var/tmp/*
+		- /var/opt/openslx
+		- /var/lib/vmware
+		+ /var
+		- /usr/lib/vmware/modules/*
+		+ /usr
+		- /tmp/*
+		+ /tmp
+		- /sys/*
+		+ /sys
+		+ /sbin
+		- /root/*
+		+ /root
+		- /proc/*
+		+ /proc
+		- /opt/openslx
+		+ /opt
+		- /mnt/*
+		+ /mnt
+		+ /lib64
+		+ /lib
+		- /home/*
+		+ /home
+		- /etc/vmware/installer.sh
+		- /etc/shadow*
+		- /etc/samba/secrets.tdb
+		- /etc/resolv.conf.*
+		- /etc/opt/openslx
+		- /etc/exports*
+		- /etc/dxs
+		+ /etc
+		- /dev/*
+		+ /dev
+		+ /boot
+		+ /bin
+		- /*
+		- .svn
+		- .*.cmd
+		- *~
+		- *lost+found*
+		- *.old
+		- *.bak
 	";
 
 	$self->initDistroInfo();