extra-filter should be named no-filter

13 files changed, 15 insertions, 16 deletions

diff --git a/BCD/Media.pm b/BCD/Media.pm
index 3a00699..49450f0 100644
--- a/BCD/Media.pm
+++ b/BCD/Media.pm
@@ -108,7 +108,7 @@ sub use_gendistrib {
 		print_color("$LOG < 2009.1 or mes5 detected", $color);
 		print_color("$LOG move hdlists and synthesys from $builddir/media/$destmedia/media_info to $builddir/media/media_info/", $color);
 		system("rm -vf $builddir/media/media_info/*_$media->{name}.cz");
-		system("rm -vf $builddir/media/media_info/*_main.cz");
+#		system("rm -vf $builddir/media/media_info/*_main.cz");
 		system("rm -vf $builddir/media/media_info/pubkey_$media->{name}");
 		system("cp -avf $builddir/media/$destmedia/media_info/hdlist.cz $builddir/media/media_info/hdlist_$media->{name}.cz");
 		system("cp -avf $builddir/media/$destmedia/media_info/pubkey $builddir/media/media_info/pubkey_$media->{name}");
diff --git a/bcd.xml b/bcd.xml
index 28ed2a6..d96cf45 100644
--- a/bcd.xml
+++ b/bcd.xml
@@ -137,7 +137,7 @@
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
 		<filedeps>file-deps</filedeps>
-		<filter>lists/extra-filter</filter>
+		<filter>lists/no-filter</filter>
 		<urpmi_option>-a</urpmi_option>
 		<askmedia desc="add for other media ?">
 			<todo>yes</todo>
diff --git a/doc/bcd.pod b/doc/bcd.pod
index 237d929..0dc9e57 100644
--- a/doc/bcd.pod
+++ b/doc/bcd.pod
@@ -144,7 +144,7 @@ or you CD will be unusable. Rpmcheck will report any bug in hdlists at the end o
 the 'media' step process. Packages listed in exclude list will be removed from the 
 DVD at the end of the build process.
 
-extra-filter:
+no-filter:
 list of RPM you want to do not compare and the keep the latest one.
 Usefull if you want to keep more than one version of a package.
 
diff --git a/doc/conf.xml.pod b/doc/conf.xml.pod
index 43c6576..e681bfa 100644
--- a/doc/conf.xml.pod
+++ b/doc/conf.xml.pod
@@ -215,11 +215,11 @@ if you want to add an urpmi options to install packages
  <urpmi_option>-a</urpmi_option>
 
 If you want to do some extra filter to keep latest release of a packages on the DVD.
-All packages listed in extra-filter are NOT filtered: so if you have more than one
+All packages listed in no-filter are NOT filtered: so if you have more than one
 version of a package in the builddir, it will bypass the rpm comparaison.
 For all other packages available in the builddir, BCD 
 will keep the latest one (rpm version comparaison)
- <filter>lists/extra-filter</filter>
+ <filter>lists/no-filter</filter>
 
 media.cfg options
  <askmedia desc="add for other media ?">
diff --git a/doc/conf.xml.tex b/doc/conf.xml.tex
index b16f3d4..d51b099 100644
--- a/doc/conf.xml.tex
+++ b/doc/conf.xml.tex
@@ -304,12 +304,12 @@ began with the strings firefox-
 \end{verbatim}
 
 If you want to do some extra filter to keep latest release of a packages on the DVD.
-All packages listed in extra-filter are NOT filtered: so if you have more than one
+All packages listed in no-filter are NOT filtered: so if you have more than one
 version of a package in the builddir, it will bypass the rpm comparaison.
 For all other packages available in the builddir, BCD 
 will keep the latest one (rpm version comparaison)
 \begin{verbatim}
- <filter>lists/extra-filter</filter>
+ <filter>lists/no-filter</filter>
 \end{verbatim}
 
 media.cfg options, do a man gendistrib for more info
diff --git a/doc/howto_bcd.tex b/doc/howto_bcd.tex
index 5cff1dc..c9d2f36 100644
--- a/doc/howto_bcd.tex
+++ b/doc/howto_bcd.tex
@@ -242,8 +242,7 @@ DVD/CD at the end of the build process.
 \end{itemize}
 
 \begin{itemize}
- \item extra-filter: list of RPM you want to compare to keep the latest one. Usefull for kernel and dkms release,
-or if you are mixing release and udpates media.
+ \item no-filter: list of RPM you don't want to compare. Usefull  to keep more than one version of a package, or use an old one.
 \end{itemize}
 
 \newpage
@@ -515,7 +514,7 @@ The product version is 2.1.1, and we use custom \textbf{compssUsers.pl} and \tex
            <rpmsrate>rpmsrate</rpmsrate>
            <compssusers>compssUsers.pl</compssusers>
            <filedeps>file-deps</filedeps>
-           <filter>lists/extra-filter</filter>
+           <filter>lists/no-filter</filter>
            <urpmi_option> --wget </urpmi_option>
            <askmedia desc="add for other media ?">
                   <todo>yes</todo>
diff --git a/dual.xml b/dual.xml
index 3e9794a..e7bdd72 100644
--- a/dual.xml
+++ b/dual.xml
@@ -135,7 +135,7 @@
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl-dual</compssusers>
 		<filedeps>file-deps32</filedeps>
-                <filter>lists/extra-filter</filter>
+                <filter>lists/no-filter</filter>
                 <urpmi_option> -p</urpmi_option>
 		<askmedia desc="add for other media ?">
 			<todo>yes</todo>
diff --git a/dual64.xml b/dual64.xml
index 54e54c8..b509645 100644
--- a/dual64.xml
+++ b/dual64.xml
@@ -130,7 +130,7 @@
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl-dual</compssusers>
 		<filedeps>file-deps64</filedeps>
-                <filter>lists/extra-filter</filter>
+                <filter>lists/no-filter</filter>
                 <urpmi_option> -p</urpmi_option>
 		<askmedia desc="add for other media ?">
 			<todo>yes</todo>
diff --git a/dvd_free32.xml b/dvd_free32.xml
index aecfeda..4883d57 100644
--- a/dvd_free32.xml
+++ b/dvd_free32.xml
@@ -146,7 +146,7 @@
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
 		<filedeps>file-deps32</filedeps>
-                <filter>lists/extra-filter</filter>
+                <filter>lists/no-filter</filter>
 		<urpmi_option>-a</urpmi_option>
 		<askmedia desc="add for other media ?">
 			<todo>yes</todo>
diff --git a/dvd_free64.xml b/dvd_free64.xml
index 648ad35..c1ac65f 100644
--- a/dvd_free64.xml
+++ b/dvd_free64.xml
@@ -146,7 +146,7 @@
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
 		<filedeps>file-deps64</filedeps>
-                <filter>lists/extra-filter</filter>
+                <filter>lists/no-filter</filter>
                 <urpmi_option>-a</urpmi_option>
 		<askmedia desc="add for other media ?">
 			<todo>yes</todo>
diff --git a/dvd_pwp32.xml b/dvd_pwp32.xml
index d902bb2..3758106 100644
--- a/dvd_pwp32.xml
+++ b/dvd_pwp32.xml
@@ -192,7 +192,7 @@
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
 		<filedeps>file-deps</filedeps>
-                <filter>lists/extra-filter</filter>
+                <filter>lists/no-filter</filter>
                 <urpmi_option>-a </urpmi_option>
 		<askmedia desc="add for other media ?">
 			<todo>yes</todo>
diff --git a/dvd_pwp64.xml b/dvd_pwp64.xml
index abe7fa2..b837224 100644
--- a/dvd_pwp64.xml
+++ b/dvd_pwp64.xml
@@ -288,7 +288,7 @@
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
 		<filedeps>file-deps</filedeps>
-                <filter>lists/extra-filter</filter>
+                <filter>lists/no-filter</filter>
                 <urpmi_option>-a </urpmi_option>
 		<askmedia desc="add for other media ?">
 			<todo>yes</todo>
diff --git a/lists/extra-filter b/lists/no-filter
index 4dd86cc..4dd86cc 100644
--- a/lists/extra-filter
+++ b/lists/no-filter