summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-11 17:26:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-11 17:26:52 +0000
commitd8314d9dd12f1bc40960ee9a498ded4ed9e917a3 (patch)
tree7c21d95e48ce824e36707cede847a1e014488306 /urpm
parent8d2124bcbfd6f1d206035c95b2c88054bfae8612 (diff)
downloadurpmi-d8314d9dd12f1bc40960ee9a498ded4ed9e917a3.tar
urpmi-d8314d9dd12f1bc40960ee9a498ded4ed9e917a3.tar.gz
urpmi-d8314d9dd12f1bc40960ee9a498ded4ed9e917a3.tar.bz2
urpmi-d8314d9dd12f1bc40960ee9a498ded4ed9e917a3.tar.xz
urpmi-d8314d9dd12f1bc40960ee9a498ded4ed9e917a3.zip
- 5.0
- urpmf, urpmq: o use xml info instead of hdlist when possible o "urpmq -l" is faster (3x) o "urpmf -l" is slower (1.5x) o "urpmf --sourcerpm" is much faster o see "xml-info" option in urpmi.cfg(5) to see when those files are downloaded o new require: perl module XML::LibXML - urpmq: o use rpm file instead of hdlist/xml-info when file is local o use URPM::Package->changelogs (need perl-URPM 3.06) - urpmi.update, urpmi.addmedia, urpmi.removemedia: o drop hdlist support replaced with xml media_info (this imply file-deps are correctly handled, see genhdlist2(1)) - urpmi.addmedia o new --xml-info option
Diffstat (limited to 'urpm')
-rw-r--r--urpm/args.pm1
-rw-r--r--urpm/cfg.pm1
-rw-r--r--urpm/media.pm158
-rw-r--r--urpm/xml_info.pm168
-rw-r--r--urpm/xml_info_pkg.pm46
5 files changed, 358 insertions, 16 deletions
diff --git a/urpm/args.pm b/urpm/args.pm
index 585166f4..0181a544 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -303,6 +303,7 @@ my %options_spec = (
},
'urpmi.addmedia' => {
+ 'xml-info=s' => \$options{'xml-info'},
'no-probe' => sub { $options{probe_with} = undef },
distrib => sub { $options{distrib} = 1 },
interactive => sub { $options{interactive} = 1 },
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index 68421910..01fbc9cd 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -149,6 +149,7 @@ sub load_config_raw {
|removable
|md5sum
|limit-rate
+ |xml-info
|excludepath
|split-(?:level|length)
|priority-upgrade
diff --git a/urpm/media.pm b/urpm/media.pm
index 7b570542..ad66b9ed 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -12,7 +12,6 @@ use MDV::Distribconf;
our @PER_MEDIA_OPT = qw(
downloader
- hdlist
ignore
key-ids
list
@@ -29,8 +28,11 @@ our @PER_MEDIA_OPT = qw(
virtual
with_hdlist
with_synthesis
+ xml-info
);
+my @xml_media_info = ('info', 'files', 'changelog');
+
sub get_medium_option {
my ($urpm, $medium, $option_name) = @_;
@@ -259,6 +261,14 @@ sub statedir_MD5SUM {
my ($urpm, $medium) = @_;
statedir_media_info_file($urpm, $medium, 'MD5SUM', '');
}
+sub statedir_hdlist {
+ my ($urpm, $medium) = @_;
+ statedir_media_info_file($urpm, $medium, 'hdlist', '.cz');
+}
+sub statedir_xml_info {
+ my ($urpm, $medium, $xml_info) = @_;
+ statedir_media_info_file($urpm, $medium, $xml_info, '.xml.lzma');
+}
sub cachedir_with_synthesis {
my ($urpm, $medium) = @_;
_url_with_synthesis($medium) && "$urpm->{cachedir}/partial/" . _url_with_synthesis_basename($medium);
@@ -269,6 +279,27 @@ sub any_synthesis {
: statedir_synthesis($urpm, $medium);
-e $f && $f;
}
+sub any_media_info_file {
+ my ($urpm, $medium, $prefix, $suffix, $quiet) = @_;
+
+ if (my $base = file_from_file_url($medium->{url})) {
+ my $f = $medium->{with_synthesis}
+ ? reduce_pathname("$base/$prefix." . _synthesis_suffix($medium) . $suffix)
+ : _synthesis_dir($medium) . "/$prefix$suffix";
+
+ -e $f && $f;
+ } else {
+ _any_media_info__or_download($urpm, $medium, $prefix, $suffix, $quiet);
+ }
+}
+sub any_hdlist {
+ my ($urpm, $medium, $quiet) = @_;
+ any_media_info_file($urpm, $medium, 'hdlist', '.cz', $quiet);
+}
+sub any_xml_info {
+ my ($urpm, $medium, $xml_info, $quiet) = @_;
+ any_media_info_file($urpm, $medium, $xml_info, '.xml.lzma', $quiet);
+}
sub name2medium {
my ($urpm, $name) = @_;
@@ -276,6 +307,27 @@ sub name2medium {
$medium;
}
+sub userdirs {
+ my ($urpm) = @_;
+ my $prefix = urpm::userdir_prefix($urpm);
+ grep { m!^\Q$prefix\E\d+$! && -d $_ && ! -l $_ } glob("$prefix*");
+}
+
+sub remove_user_media_info_files {
+ my ($urpm, $medium) = @_;
+
+ foreach my $dir (userdirs($urpm)) {
+ require File::Glob;
+ # we can't use perl's glob() because $medium->{name} can contain spaces
+ my @files = map { File::Glob::bsd_glob("$dir/*.$medium->{name}.$_") } 'cz', 'xml.lzma' or next;
+
+ $urpm->{log}("cleaning $dir");
+ foreach (@files) {
+ unlink $_ or $urpm->{error}("removing $_ failed");
+ }
+ }
+}
+
#- probe device associated with a removable device.
sub probe_removable_device {
my ($urpm, $medium) = @_;
@@ -357,8 +409,7 @@ sub _tempignore {
#- nocheck_access (used by read_config)
#-
#- callback (urpmf)
-#- need_xml (for urpmf: to be able to have info not available in synthesis)
-#- nodepslist (for urpmq: we don't need the synthesis)
+#- nodepslist (for urpmq, urpmf: when we don't need the synthesis)
#- no_skiplist (urpmf)
#-
#- synthesis (use this synthesis file, and only this synthesis file)
@@ -456,14 +507,9 @@ sub _parse_media {
my ($urpm, $options) = @_;
foreach (grep { !$_->{ignore} && (!$options->{update} || $_->{update}) } @{$urpm->{media} || []}) {
- our $currentmedia = $_; #- hack for urpmf
delete @$_{qw(start end)};
_parse_synthesis_or_ignore($urpm, $_, $options->{callback});
- if ($options->{need_xml}) {
- # TODO
- # _parse_xml_($urpm, $_, any_xml($urpm, $_), $options->{callback});
- }
if ($_->{searchmedia}) {
$urpm->{searchmedia} = 1;
$urpm->{log}(N("Search start: %s end: %s", $_->{start}, $_->{end}));
@@ -506,7 +552,7 @@ sub _compute_flags_for_instlist {
#- add a new medium, sync the config file accordingly.
#- returns the new medium's name. (might be different from the requested
#- name if index_name was specified)
-#- options: ignore, index_name, nolock, update, virtual, media_info_dir
+#- options: ignore, index_name, nolock, update, virtual, media_info_dir, xml-info
sub add_medium {
my ($urpm, $name, $url, $with_synthesis, %options) = @_;
@@ -532,7 +578,7 @@ sub add_medium {
url => $url,
modified => !$options{ignore},
};
- foreach (qw(downloader update ignore media_info_dir)) {
+ foreach (qw(downloader update ignore media_info_dir xml-info)) {
$medium->{$_} = $options{$_} if exists $options{$_};
}
@@ -729,7 +775,9 @@ sub remove_media {
$urpm->{modified} = 1;
#- remove files associated with this medium.
- unlink grep { $_ } map { $_->($urpm, $medium) } \&statedir_synthesis, \&statedir_descriptions, \&statedir_names, \&statedir_MD5SUM;
+ unlink grep { $_ } map { $_->($urpm, $medium) } \&statedir_synthesis, \&statedir_descriptions, \&statedir_names, \&statedir_MD5SUM, \&statedir_hdlist;
+ unlink statedir_xml_info($urpm, $medium, $_) foreach @xml_media_info;
+ remove_user_media_info_files($urpm, $medium);
#- remove proxy settings for this media
urpm::download::remove_proxy_media($medium->{name});
@@ -941,23 +989,26 @@ sub _download_list_or_pubkey {
}
sub _download_media_info_file {
- my ($urpm, $medium, $prefix, $suffix, $quiet) = @_;
+ my ($urpm, $medium, $prefix, $suffix, $quiet, $o_download_dir) = @_;
+ my $download_dir = $o_download_dir || "$urpm->{cachedir}/partial";
my $name = "$prefix$suffix";
+ my $result_file = "$download_dir/$name";
my $found;
if (_synthesis_suffix($medium)) {
my $local_name = $prefix . _synthesis_suffix($medium) . $suffix;
if (urpm::download::sync($urpm, $medium, [_synthesis_dir($medium) . "/$local_name"],
- quiet => $quiet)) {
- rename("$urpm->{cachedir}/partial/$local_name", "$urpm->{cachedir}/partial/$name");
+ dir => $download_dir, quiet => $quiet)) {
+ rename("$download_dir/$local_name", $result_file);
$found = 1;
}
}
if (!$found) {
- urpm::download::sync($urpm, $medium, [_synthesis_dir($medium) . "/$name"], quiet => 1)
- or unlink "$urpm->{cachedir}/partial/$name";
+ urpm::download::sync($urpm, $medium, [_synthesis_dir($medium) . "/$name"], dir => $download_dir, quiet => 1)
+ or unlink $result_file;
}
+ -s $result_file && $result_file;
}
sub get_descriptions_local {
@@ -1340,6 +1391,14 @@ sub _update_medium_ {
statedir_MD5SUM($urpm, $medium)) if -e "$urpm->{cachedir}/partial/MD5SUM";
}
+ # we never download hdlist by default. urpmf will download it via any_hdlist() if really needed
+ unlink statedir_hdlist($urpm, $medium);
+
+ remove_user_media_info_files($urpm, $medium);
+
+ if (!file_from_file_url($medium->{url})) {
+ _retrieve_xml_media_info_or_remove($urpm, $medium, $options{quiet}) or return;
+ }
}
$medium->{modified} = 0;
@@ -1430,6 +1489,73 @@ sub update_media {
$updates_result{error} == 0;
}
+sub _retrieve_xml_media_info_or_remove {
+ my ($urpm, $medium, $quiet) = @_;
+
+ my $ok = 1;
+
+ foreach my $xml_info (@xml_media_info) {
+ my $f = statedir_xml_info($urpm, $medium, $xml_info);
+
+ if ($medium->{removable} ||
+ get_medium_option($urpm, $medium, 'xml-info') eq 'always' ||
+ get_medium_option($urpm, $medium, 'xml-info') eq 'update-only' && -e $f) {
+ $ok &&= _retrieve_media_info_file_and_check_MD5SUM($urpm, $medium, $xml_info, '.xml.lzma', $quiet);
+ } else {
+ #- "on-demand"
+ unlink $f;
+ }
+ }
+ $ok;
+}
+
+sub _retrieve_media_info_file_and_check_MD5SUM {
+ my ($urpm, $medium, $prefix, $suffix, $quiet) = @_;
+
+ my $name = "$prefix$suffix";
+ my $cachedir_file =
+ file_from_local_url($medium->{url}) ?
+ _copy_media_info_file($urpm, $medium, $prefix, $suffix) :
+ _download_media_info_file($urpm, $medium, $prefix, $suffix, $quiet) or
+ $urpm->{error}(N("retrieval of [%s] failed", _synthesis_dir($medium) . "/$name")), return;
+
+ my $wanted_md5sum = urpm::md5sum::from_MD5SUM__or_warn($urpm, statedir_MD5SUM($urpm, $medium), $name);
+ if ($wanted_md5sum) {
+ $urpm->{debug}("computing md5sum of retrieved $name") if $urpm->{debug};
+ urpm::md5sum::compute($cachedir_file) eq $wanted_md5sum or
+ $urpm->{error}(N("retrieval of [%s] failed (md5sum mismatch)", _synthesis_dir($medium) . "/$name")), return;
+
+ urpm::util::move($cachedir_file, statedir_media_info_file($urpm, $medium, $prefix, $suffix)) or return;
+ }
+ 1;
+}
+
+sub _any_media_info__or_download {
+ my ($urpm, $medium, $prefix, $suffix, $quiet) = @_;
+
+ my $name = "$prefix.$medium->{name}$suffix";
+ my $f = "$urpm->{statedir}/$name";
+ -s $f and return $f;
+
+ my $download_dir;
+ if (my $userdir = urpm::userdir($urpm)) {
+ $f = "$userdir/$name";
+ -s $f and return $f;
+
+ $download_dir = "$userdir/partial";
+ mkdir $download_dir;
+ }
+
+ get_medium_option($urpm, $medium, 'xml-info') ne 'never' or return;
+
+ my $file_in_partial =
+ _download_media_info_file($urpm, $medium, $prefix, $suffix, $quiet, $download_dir) or return;
+
+ urpm::util::move($file_in_partial, $f) or return;
+
+ $f;
+}
+
#- clean params and depslist computation zone.
sub clean {
my ($urpm) = @_;
diff --git a/urpm/xml_info.pm b/urpm/xml_info.pm
new file mode 100644
index 00000000..4148940f
--- /dev/null
+++ b/urpm/xml_info.pm
@@ -0,0 +1,168 @@
+package urpm::xml_info;
+
+use XML::LibXML::Reader;
+
+# throw an exception on error
+sub get_nodes {
+ my ($xml_info, $xml_info_file, $fullnames) = @_;
+
+ my $get_one_node = _get_one_node($xml_info);
+ _get_xml_info_nodes($xml_info_file, $get_one_node, $fullnames);
+}
+
+# throw an exception on error
+sub do_something_with_nodes {
+ my ($xml_info, $xml_info_file, $do, $o_wanted_attributes) = @_;
+
+ my $get_one_node = _get_one_node($xml_info, $o_wanted_attributes);
+ _do_something_with_xml_info_nodes($xml_info_file, $get_one_node, $do);
+}
+
+
+################################################################################
+sub _open_xml_reader {
+ my ($xml_info_file) = @_;
+
+ open(my $F, "lzma -dc $xml_info_file |");
+ my $reader = new XML::LibXML::Reader(IO => $F) or die "cannot read $xml_info_file\n";
+
+ $reader->read;
+ $reader->name eq 'media_info' or die "global <media_info> tag not found\n";
+
+ $reader->read; # first tag
+
+ $reader;
+}
+
+sub _get_all_attributes {
+ my ($reader) = @_;
+ my %entry;
+
+ $reader->moveToFirstAttribute;
+
+ do {
+ $entry{$reader->name} = $reader->value;
+ } while $reader->moveToNextAttribute == 1;
+
+ \%entry;
+}
+
+sub _get_attributes {
+ my ($reader, $o_wanted_attributes) = @_;
+
+ if ($o_wanted_attributes) {
+ my %entry = map { $_ => $reader->getAttribute($_) } @$o_wanted_attributes;
+ \%entry;
+ } else {
+ _get_all_attributes($reader);
+ }
+}
+
+sub _get_simple_value_node {
+ my ($value_name, $o_wanted_attributes) = @_;
+
+ sub {
+ my ($reader) = @_;
+ my $entry = _get_attributes($reader, $o_wanted_attributes);
+
+ $reader->read; # get value
+ $entry->{$value_name} = $reader->value;
+ $entry->{$value_name} =~ s/^\n//;
+
+ $reader->read; # close tag
+ $reader->read; # open next tag
+
+ $entry;
+ };
+}
+
+sub _get_changelog_node {
+ my ($reader, $fn) = @_;
+
+ $reader->nextElement('log'); # get first <log>
+
+ my @changelogs;
+ my $time;
+ while ($time = $reader->getAttribute('time')) {
+ push @changelogs, my $e = { time => $time };
+
+ $reader->nextElement('log_name'); $reader->read;
+ $e->{name} = $reader->value;
+
+ $reader->nextElement('log_text'); $reader->read;
+ $e->{text} = $reader->value;
+
+ $reader->read; # </log_text>
+ $reader->read; # </log>
+ $reader->read; # <log>
+ $reader->read if $reader->readState != 0; # there may be SIGNIFICANT_WHITESPACE between </log_text> and </log>
+ }
+
+ { fn => $fn, changelogs => \@changelogs };
+}
+
+sub _get_one_node {
+ my ($xml_info, $o_wanted_attributes) = @_;
+
+ if ($xml_info eq 'changelog') {
+ \&_get_changelog_node;
+ } elsif ($xml_info eq 'info') {
+ _get_simple_value_node('description', $o_wanted_attributes);
+ } else {
+ _get_simple_value_node('files', $o_wanted_attributes);
+ }
+}
+
+sub _get_xml_info_nodes {
+ my ($xml_info_file, $get_node, $fullnames) = @_;
+
+ my $fullnames_re = '^(' . join('|', map { quotemeta $_ } @$fullnames) . ')$';
+
+ my %todo = map { $_ => 1 } @$fullnames;
+ my %nodes;
+ _iterate_on_nodes($xml_info_file,
+ sub {
+ my ($reader, $fn) = @_;
+ if ($fn =~ /$fullnames_re/) {
+ $nodes{$fn} = $get_node->($reader);
+ delete $todo{$fn};
+ %todo == ();
+ } else {
+ $reader->next;
+ 0;
+ }
+ });
+
+ %todo and die "could not find " . join(', ', keys %todo) . " in $xml_info_file\n";
+
+ %nodes;
+}
+
+sub _do_something_with_xml_info_nodes {
+ my ($xml_info_file, $get_node, $do) = @_;
+
+ _iterate_on_nodes($xml_info_file,
+ sub {
+ my ($reader, $fn) = @_;
+ my $h = $get_node->($reader, $fn); # will read until closing tag
+ $do->($h);
+ 0;
+ });
+}
+
+sub _iterate_on_nodes {
+ my ($xml_info_file, $do) = @_;
+
+ my $reader = _open_xml_reader($xml_info_file);
+
+ my $fn;
+ while ($fn = $reader->getAttribute('fn')) {
+ $do->($reader, $fn) and return; # $do must go to next node otherwise it loops!
+ }
+
+ $reader->readState == 3 || $reader->name eq 'media_info'
+ or die qq(missing attribute "fn" in tag ") . $reader->name . qq("\n);
+}
+
+1;
+
diff --git a/urpm/xml_info_pkg.pm b/urpm/xml_info_pkg.pm
new file mode 100644
index 00000000..ce0fb0cd
--- /dev/null
+++ b/urpm/xml_info_pkg.pm
@@ -0,0 +1,46 @@
+package urpm::xml_info_pkg;
+
+# proxy object: returns the xml info if available, otherwise redirects to URPM::Package
+
+sub new {
+ my ($class, $hash, $pkg) = @_;
+
+ $pkg and $hash->{pkg} = $pkg;
+
+ bless $hash, $class;
+}
+
+
+# only available in synthesis/hdlist
+sub id { $_[0]{pkg}->id }
+sub group { $_[0]{pkg}->group }
+sub size { $_[0]{pkg}->size }
+sub epoch { $_[0]{pkg}->epoch }
+sub buildhost { $_[0]{pkg}->buildhost }
+sub packager { $_[0]{pkg}->packager }
+sub summary { $_[0]{pkg}->summary }
+
+
+# can be directly available in xml_info
+sub url { exists $_[0]{url} ? $_[0]{url} : $_[0]{pkg}->url }
+sub licence { exists $_[0]{licence} ? $_[0]{licence} : $_[0]{pkg}->licence }
+sub sourcerpm { exists $_[0]{sourcerpm} ? $_[0]{sourcerpm} : $_[0]{pkg}->sourcerpm }
+sub description { exists $_[0]{description} ? $_[0]{description} : $_[0]{pkg}->description }
+
+sub changelogs { exists $_[0]{changelogs} ? @{$_[0]{changelogs}} : $_[0]{pkg}->changelogs }
+
+sub files { exists $_[0]{files} ? split("\n", $_[0]{files}) : $_[0]{pkg}->files }
+
+my $fullname_re = qr/^(.*)-([^\-]*)-([^\-]*)\.([^\.\-]*)$/;
+
+# available in both {pkg} and {fn}
+sub name { exists $_[0]{pkg} ? $_[0]{pkg}->name : $_[0]{fn} =~ $fullname_re && $1 }
+sub version { exists $_[0]{pkg} ? $_[0]{pkg}->version : $_[0]{fn} =~ $fullname_re && $2 }
+sub release { exists $_[0]{pkg} ? $_[0]{pkg}->release : $_[0]{fn} =~ $fullname_re && $3 }
+sub arch { exists $_[0]{pkg} ? $_[0]{pkg}->arch : $_[0]{fn} =~ $fullname_re && $4 }
+
+sub fullname { wantarray ? $_[0]{pkg}->fullname : $_[0]{fn} }
+sub filename { $_[0]{fn} . '.rpm' }
+
+
+1;