summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-04-17 22:12:51 +0000
committerFrancois Pons <fpons@mandriva.com>2003-04-17 22:12:51 +0000
commitef6c0a79a3d2611505bba6104dab2d46412752be (patch)
treee48502eae453ee9c680fa2355a9ee85c0b772939
parentfd4cbdf8fba438b9c20bd163189be6885c4d3af1 (diff)
downloadurpmi-ef6c0a79a3d2611505bba6104dab2d46412752be.tar
urpmi-ef6c0a79a3d2611505bba6104dab2d46412752be.tar.gz
urpmi-ef6c0a79a3d2611505bba6104dab2d46412752be.tar.bz2
urpmi-ef6c0a79a3d2611505bba6104dab2d46412752be.tar.xz
urpmi-ef6c0a79a3d2611505bba6104dab2d46412752be.zip
4.3-4mdk
-rw-r--r--urpmi.spec5
-rwxr-xr-xurpmq39
2 files changed, 40 insertions, 4 deletions
diff --git a/urpmi.spec b/urpmi.spec
index 65f8f5c6..039d1e99 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 4.3
-Release: 3mdk
+Release: 4mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
@@ -199,6 +199,9 @@ $urpm->update_media;
%changelog
+* Fri Apr 18 2003 François Pons <fpons@mandrakesoft.com> 4.3-4mdk
+- added urpmq -i (the almost same as rpm -qi).
+
* Thu Apr 17 2003 François Pons <fpons@mandrakesoft.com> 4.3-3mdk
- fixed readlink that make supermount sloowwwwwiiiinnnngggg.
- improved find_mntpoints to follow symlink more accurately
diff --git a/urpmq b/urpmq
index e62008b9..5ed296bc 100755
--- a/urpmq
+++ b/urpmq
@@ -133,6 +133,7 @@ while (defined($_ = shift @ARGV)) {
/y/ and do { $query->{fuzzy} = 1; next };
/s/ and do { $query->{src} = 1; next };
/v/ and do { $query->{verbose} = 1; next };
+ /i/ and do { $query->{info} = 1; next };
/r/ and do { $query->{version} = $query->{release} = 1; next };
/f/ and do { $query->{version} = $query->{release} = $query->{arch} = 1; next };
print STDERR N("urpmq: unknown option \"-%s\", check usage with --help\n", $1); exit(1) } next };
@@ -291,7 +292,7 @@ if ($query->{list_aliases}) {
$state->{selected} = \%requested;
}
- if ($query->{headers} || $query->{sources}) {
+ if ($query->{headers} || $query->{sources} || $query->{info}) {
my ($local_sources, $list) = $urpm->get_source_packages($state->{selected});
unless ($local_sources || $list) {
$urpm->{fatal}(1, N("unable to get source packages, aborting"));
@@ -313,11 +314,43 @@ if ($query->{list_aliases}) {
$packer->extract_archive(undef, @headers);
} else {
#- fallback to retrieve rpm package before, so that --headers will be ok.
- my %downloads = $urpm->download_source_packages({}, $list, 'local', undef);
+ my %downloads = $urpm->download_source_packages({}, $list, force_local => 1);
system "rpm2header", values %downloads;
}
}
- } else {
+ } elsif ($query->{info}) {
+ my %downloads;
+ unless ($>) {
+ foreach (0..$#{$urpm->{media} || []}) {
+ if (my @headers = (grep { my $file = "$urpm->{cachedir}/headers/$_"; ! -s $file }
+ map { my $pkg = $urpm->{depslist}[$_];
+ $pkg && $pkg->header_filename } keys %{$list->[$_]})) {
+ #map { /(.*)\/([^\/]*)-([^-]*)-([^-]*)\.([^\.]*)\.rpm/ and "$2-$3-$4.$5" } values %{$list->[$_]})) {
+ if ($< == 0 && -s "$urpm->{statedir}/$urpm->{media}[$_]{hdlist}") {
+ require packdrake;
+ my $packer = new packdrake("$urpm->{statedir}/$urpm->{media}[$_]{hdlist}");
+ $packer->extract_archive("$urpm->{cachedir}/headers", @headers);
+ } elsif (!%downloads) {
+ #- fallback to retrieve rpm package before, so that --headers will be ok.
+ %downloads = $urpm->download_source_packages({}, $list, force_local => 1);
+ }
+ }
+ }
+ }
+ foreach (keys %{$state->{selected}}) {
+ my $pkg = $urpm->{depslist}[$_] or next;
+ my $file = $local_sources->{$_} || $downloads{$_} || "$urpm->{cachedir}/headers/".$pkg->header_filename;
+ $pkg->update_header($file, 0, 1);
+ printf "%-12s: %s\n", "Name", $pkg->name;
+ printf "%-12s: %s\n", "Version", $pkg->version;
+ printf "%-12s: %s\n", "Release", $pkg->release;
+ printf "%-12s: %s\n", "Group", $pkg->group;
+ $pkg->sourcerpm and printf "%-12s: %s\n", "Source RPM", $pkg->sourcerpm;
+ printf "%-12s: %-28s %12s: %s\n", "Size", $pkg->size, "Architecture", $pkg->arch;
+ $pkg->summary and printf "%-12s: %s\n", "Summary", $pkg->summary;
+ $pkg->description and printf "%-12s:\n%s\n", "Description", $pkg->description;
+ }
+ } elsif ($query->{sources}) {
print join "\n", values %$local_sources; values %$local_sources and print "\n";
foreach (0..$#{$urpm->{media} || []}) {
print join "\n", values %{$list->[$_]}; values %{$list->[$_]} and print "\n";