- Implement versioning aware archiving support (closes: #419693)

[debbugs.git] / Debbugs / Config.pm

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 9134718e9508a9221575fb2d75993dd6727e2b7d..6b8639fcc57fb097131a06ae6f3fb3ee2a9bac8c 100644 (file)
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -450,39 +450,43 @@ set_default(\%config,'version_packages_dir',$config{spool_dir}.'/../versions/pkg
 =item version_time_index
 
 Location of the version/time index file. Defaults to
-spool_dir/../versions/idx/versions_time.idx
+spool_dir/../versions/idx/versions_time.idx if spool_dir/../versions
+exists; otherwise defaults to undef.
 
 =cut
 
 
-set_default(\%config,'version_time_index',$config{spool_dir}.'../versions/idx/versions_time.idx');
+set_default(\%config,'version_time_index', -d $config{spool_dir}.'/../versions' ? $config{spool_dir}.'/../versions/indices/versions_time.idx' : undef);
 
 =item version_index
 
 Location of the version index file. Defaults to
-spool_dir/../versions/idx/versions.idx
+spool_dir/../versions/indices/versions.idx if spool_dir/../versions
+exists; otherwise defaults to undef.
 
 =cut
 
-set_default(\%config,'version_index',$config{spool_dir}.'../versions/idx/versions.idx');
+set_default(\%config,'version_index',-d $config{spool_dir}.'/../versions' ? $config{spool_dir}.'/../versions/indices/versions.idx' : undef);
 
 =item binary_source_map
 
 Location of the binary -> source map. Defaults to
-spool_dir/../versions/idx/binsrc.idx
+spool_dir/../versions/indices/bin2src.idx if spool_dir/../versions
+exists; otherwise defaults to undef.
 
 =cut
 
-set_default(\%config,'binary_source_map',$config{spool_dir}.'../versions/idx/binsrc.idx');
+set_default(\%config,'binary_source_map',-d $config{spool_dir}.'/../versions' ? $config{spool_dir}.'/../versions/indices/binsrc.idx' : undef);
 
 =item source_binary_map
 
 Location of the source -> binary map. Defaults to
-spool_dir/../versions/idx/srcbin.idx
+spool_dir/../versions/indices/src2bin.idx if spool_dir/../versions
+exists; otherwise defaults to undef.
 
 =cut
 
-set_default(\%config,'source_binary_map',$config{spool_dir}.'../versions/idx/srcbin.idx');
+set_default(\%config,'source_binary_map',-d $config{spool_dir}.'/../versions' ? $config{spool_dir}.'/../versions/indices/srcbin.idx' : undef);