- -c option is no more (only kept for compatibility in urpmi.update)

- {cachedir}/headers is not used anymore

6 files changed, 5 insertions, 8 deletions

diff --git a/urpm.pm b/urpm.pm
index 7a372a93..8ce36fb6 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -151,7 +151,7 @@ sub create_var_lib_rpm {
     my ($urpm, %h) = @_;
     require File::Path;
     File::Path::mkpath([ $h{statedir}, 
-			 (map { "$h{cachedir}/$_" } qw(headers partial rpms)),
+			 (map { "$h{cachedir}/$_" } qw(partial rpms)),
 			 dirname($h{config}),
 			 "$urpm->{root}/var/lib/rpm",
 			 "$urpm->{root}/var/tmp",
diff --git a/urpmi.addmedia b/urpmi.addmedia
index 18d93061..47554222 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -77,7 +77,6 @@ and [options] are from
 ") . N("  --no-md5sum    - disable MD5SUM file checking.
 ") . N("  --nopubkey     - don't import pubkey of added media
 ") . N("  --raw          - add the media in config, but don't update it.
-") . N("  -c             - clean headers cache directory.
 ") . N("  -q             - quiet mode.
 ") . N("  -v             - verbose mode.
 ");
diff --git a/urpmi.bash-completion b/urpmi.bash-completion
index 47aa8d67..2375937f 100644
--- a/urpmi.bash-completion
+++ b/urpmi.bash-completion
@@ -222,7 +222,7 @@ _urpmi_update()
 
 	if [[ "$cur" == -* ]]; then
 		# return list of available options
-		COMPREPLY=( $( compgen -W "$common_options -a -c -f --wget --prozilla \
+		COMPREPLY=( $( compgen -W "$common_options -a -f --wget --prozilla \
 			--curl --limit-rate --proxy --proxy-user --update \
 			--ignore --no-ignore \
 			--no-md5sum --force-key --norebuild" \
@@ -245,7 +245,7 @@ _urpmi_addmedia()
 
 	if [[ "$cur" == -* ]]; then
 		# return list of available options
-		COMPREPLY=( $( compgen -W "$common_options -c -f --wget --curl --prozilla \
+		COMPREPLY=( $( compgen -W "$common_options -f --wget --curl --prozilla \
 			--limit-rate --proxy --proxy-user --update --raw \
 			--probe-synthesis --probe-hdlist --probe-rpms --no-probe --distrib \
 			--env --version --arch --virtual --norebuild --nopubkey" -- $cur ) )
@@ -288,7 +288,7 @@ _urpmi_removemedia()
 
 	if [[ "$cur" == -* ]]; then
 		# if word begins with a dash, return list of available options
-		COMPREPLY=( $( compgen -W "$common_options -a -c -y" -- $cur ) )
+		COMPREPLY=( $( compgen -W "$common_options -a -y" -- $cur ) )
 	else
 		# elsewhere, return list of available media
 		_urpmi_medias
diff --git a/urpmi.removemedia b/urpmi.removemedia
index b9541e6b..247030ee 100755
--- a/urpmi.removemedia
+++ b/urpmi.removemedia
@@ -39,7 +39,6 @@ sub usage {
 where <name> is a medium name to remove.
 ") . N("  --help         - print this help message.
 ") . N("  -a             - select all media.
-") . N("  -c             - clean headers cache directory.
 ") . N("  -y             - fuzzy match on media names.
 ") . N("  -q             - quiet mode.
 ") . N("  -v             - verbose mode.
diff --git a/urpmi.update b/urpmi.update
index 894516a6..6c2e6e83 100755
--- a/urpmi.update
+++ b/urpmi.update
@@ -46,7 +46,6 @@ where <name> is a medium name to update.
 ") . N("  --urpmi-root   - use another root for urpmi db & rpm installation.
 ") . N("  --probe-rpms   - do not use synthesis, use rpm files directly
 ") . N("  -a             - select all non-removable media.
-") . N("  -c             - clean headers cache directory.
 ") . N("  -f             - force updating synthesis
 ") . N("  -ff            - really force updating synthesis
 ") . N("  -q             - quiet mode.
diff --git a/urpmq b/urpmq
index 7a2bc10b..e87f21c7 100755
--- a/urpmq
+++ b/urpmq
@@ -376,7 +376,7 @@ if ($options{list_aliases}) {
 		    my $pkg = $urpm->{depslist}[$id] or next;
 
 		    #- even if non-root, search for a header in the global cachedir
-		    my $file = $local_sources->{$id} || "$urpm->{cachedir}/headers/" . $pkg->header_filename;
+		    my $file = $local_sources->{$id};
 		    if (-s $file) {
 			$pkg->update_header($file, keep_all_tags => 1);
 		    } elsif ($xml_info_pkgs{$id}) {