summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-05-24 00:21:23 +0000
committerNorbert Preining <preining@logic.at>2012-05-24 00:21:23 +0000
commit6e7b3ef9438fcaba7c2123aa740df43812e497e9 (patch)
treeefeee34ef331628b5112b18b1274cb0c6c401e7e /Master
parentb74ab6d22996ea739453c7df39ee2abfb6c61f36 (diff)
show origin in info action if available
log origin in package log file git-svn-id: svn://tug.org/texlive/trunk@26612 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl16
1 files changed, 14 insertions, 2 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index fdc5badeb47..85e53d1c6e6 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1153,6 +1153,7 @@ sub action_info {
foreach my $ppp ($what, @todo) {
my ($pkg, $tag) = split '@', $ppp, 2;
my $tlpdb = $localtlpdb;
+ my $source_found;
my $tlp = $localtlpdb->get_package($pkg);
my $installed = 0;
if (!$tlp) {
@@ -1216,6 +1217,17 @@ sub action_info {
tlwarn("tlmgr: cannot find package $pkg\n");
next;
}
+ # we want to also show the source if it is known
+ if (defined($tag)) {
+ $source_found = $tag;
+ } else {
+ if ($remotetlpdb->is_virtual) {
+ my ($firsttag, @cand) = $remotetlpdb->candidates($pkg);
+ $source_found = $firsttag;
+ } else {
+ # might be single user repository, don't mention anything
+ }
+ }
$tlpdb = $remotetlpdb;
} else {
$installed = 1;
@@ -1236,7 +1248,7 @@ sub action_info {
# only collectons:
@colls = grep {m;^collection-;} @colls;
print "package: ", $tlp->name, "\n";
- print "repository: ", $tag, "\n" if (defined($tag));
+ print "repository: ", $source_found, "\n" if (defined($source_found));
print "category: ", $tlp->category, "\n";
print "shortdesc: ", $tlp->shortdesc, "\n" if ($tlp->shortdesc);
print "longdesc: ", $tlp->longdesc, "\n" if ($tlp->longdesc);
@@ -3367,7 +3379,7 @@ sub action_install {
if (!$opts{"dry-run"}) {
$remotetlpdb->install_package($pkg, $localtlpdb,
($packs{$pkg} ? $packs{$pkg} : undef) );
- logpackage("${re}install: $pkg");
+ logpackage("${re}install: $pkg$tagstr");
}
$donesize += $sizes{$pkg};
$currnr++;