From 0da79b7899c0ac30ca22a02eecd758dab5ab580b Mon Sep 17 00:00:00 2001
From: Maarten Vanraes <alien@mageia.org>
Date: Sun, 1 Sep 2013 15:32:44 +0200
Subject: have no merge files by default

---
 urpmi-proxy.cgi  | 4 ++--
 urpmi-proxy.conf | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/urpmi-proxy.cgi b/urpmi-proxy.cgi
index 38c57ba..bb1fec2 100755
--- a/urpmi-proxy.cgi
+++ b/urpmi-proxy.cgi
@@ -15,7 +15,7 @@ my $cache_path = '/var/cache/urpmi-proxy';
 my $logfile = '/var/log/urpmi-proxy.log';
 my $check_updates_only_files = '(MD5SUM|descriptions)';
 my $check_no_updates_files;
-my $merge_files = 'media.cfg';
+my $merge_files = undef;
 my $sources = [
 	'urpmi'
 ];
@@ -85,7 +85,7 @@ if (defined $check_updates_only_files) {
 }
 
 # check if request needs merging
-$merge = 1 if $filename =~ m/$merge_files/;
+$merge = 1 if defined $merge_files && $filename =~ m/$merge_files/;
 $check_file = 1 if $merge;
 
 print STDERR "check_file: $check_file\n" if $debug;
diff --git a/urpmi-proxy.conf b/urpmi-proxy.conf
index 1775653..ccb6bd3 100644
--- a/urpmi-proxy.conf
+++ b/urpmi-proxy.conf
@@ -43,7 +43,7 @@
 # $check_no_updates_files = undef;
 
 ## These files will be merged from every sources.
-# $merge_files = 'media.cfg';
+# $merge_files = undef;
 
 ## These are the tuning settings when downloading files.
 # $connect_timeout = 120;
-- 
cgit v1.2.1