update the multi-source patch

git-svn-id: svn://tug.org/texlive/trunk@22248 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 20 insertions, 31 deletions

diff --git a/Master/tlpkg/dev/dev.multi-source-support-v2.patch b/Master/tlpkg/dev/dev.multi-source-support-v2.patch
index 4b4949995b3..9f44881e5a6 100644
--- a/Master/tlpkg/dev/dev.multi-source-support-v2.patch
+++ b/Master/tlpkg/dev/dev.multi-source-support-v2.patch
@@ -1,14 +1,7 @@
---- /src/TeX/texlive-svn/Master/tlpkg/TeXLive/TLPDB.pm	2011-04-27 17:49:03.000000000 +0900
-+++ tlpkg/TeXLive/TLPDB.pm	2011-04-27 17:49:50.000000000 +0900
-@@ -6,7 +6,7 @@
- 
- package TeXLive::TLPDB;
- 
--my $svnrev = '$Revision: 22215 $';
-+my $svnrev = '$Revision: 22010 $';
- my $_modulerevision;
- if ($svnrev =~ m/: ([0-9]+) /) {
-   $_modulerevision = $1;
+Index: tlpkg/TeXLive/TLPDB.pm
+===================================================================
+--- tlpkg/TeXLive/TLPDB.pm	(revision 22247)
++++ tlpkg/TeXLive/TLPDB.pm	(working copy)
 @@ -73,10 +73,17 @@
    $tlpdb->install_package($pkg, $dest_tlpdb, $nopostinstall, $fallbacktlpdb);
    $tlpdb->remove_package($pkg, %options);
@@ -367,15 +360,7 @@
    my $fromtlpdb = $self;
    my $ret;
    die("TLPDB not initialized, cannot find tlpdb!") unless (defined($fromtlpdb));
-@@ -1346,6 +1496,7 @@
-         # we are installing from local compressed files
-         # copy it to temp
-         TeXLive::TLUtils::copy($what, $tempdir);
-+system("ls -al $tempdir");
-       }
-       debug("un-xzing $xzfile to $tarfile\n");
-       system("$xzdec < $xzfile_quote > $tarfile_quote");
-@@ -1548,7 +1699,12 @@
+@@ -1547,7 +1697,12 @@
  sub _set_value_pkg {
    my ($self,$pkgname,$pre,$key,$value) = @_;
    my $k = "$pre$key";
@@ -389,7 +374,7 @@
    my @newdeps;
    if (!defined($pkg)) {
      $pkg = new TeXLive::TLPOBJ;
-@@ -1586,8 +1742,14 @@
+@@ -1585,8 +1740,14 @@
  sub _value_pkg {
    my ($self,$pkg,$pre,$key) = @_;
    my $k = "$pre$key";
@@ -406,7 +391,7 @@
        if ($d =~ m!^$k:(.*)$!) {
          return "$1";
        }
-@@ -1700,7 +1862,12 @@
+@@ -1699,7 +1860,12 @@
    my ($self, $pre, $hr) = @_;
    my @allowed = keys %$hr;
    my %ret;
@@ -420,7 +405,7 @@
    if (defined($pkg)) {
      foreach my $d ($pkg->depends) {
        if ($d =~ m!^$pre([^:]*):(.*)!) {
-@@ -1849,6 +2016,122 @@
+@@ -1848,6 +2014,122 @@
  
  =back
  
@@ -543,8 +528,10 @@
  =pod
  
  =head1 OPTIONS
---- /src/TeX/texlive-svn/Master/texmf/scripts/texlive/tlmgr.pl	2011-04-27 17:53:53.000000000 +0900
-+++ texmf/scripts/texlive/tlmgr.pl	2011-04-27 17:53:50.000000000 +0900
+Index: texmf/scripts/texlive/tlmgr.pl
+===================================================================
+--- texmf/scripts/texlive/tlmgr.pl	(revision 22247)
++++ texmf/scripts/texlive/tlmgr.pl	(working copy)
 @@ -480,6 +480,9 @@
    } elsif ($action =~ m/^option$/i) {
      action_option();
@@ -555,7 +542,7 @@
    } elsif ($action =~ m/^list$/i) {
      action_list();
      finish(0);
-@@ -3119,6 +3122,115 @@
+@@ -3119,7 +3122,116 @@
    return;
  }
  
@@ -567,7 +554,7 @@
 +# tlmgr repository remove [path|tag]  -> removes repository or tag
 +# tlmgr repository set path[#tag] [path[#tag] ...] -> sets the list
 +#
-+
+ 
 +sub array_to_repository {
 +  my %r = @_;
 +  my @ret;
@@ -668,9 +655,10 @@
 +  }
 +}
 +
- 
++
  #  OPTION
  #
+ sub action_option {
 @@ -4466,6 +4578,45 @@
  #
  sub init_tlmedia
@@ -717,7 +705,7 @@
    if (defined($remotetlpdb) && ($remotetlpdb->root eq $location)) {
      # nothing to be done
      return;
-@@ -4479,10 +4630,28 @@
+@@ -4479,11 +4630,29 @@
      $location =~ s,^$TeXLiveServerURL,$mirrorbase,;
    }
  
@@ -727,7 +715,7 @@
    print "location-url\t$location\n" if $::machinereadable;
    info("tlmgr: package repository $location\n");
 +}
-+
+ 
 +sub setup_one_remotetlpdb
 +{
 +  my $location = shift;
@@ -743,9 +731,10 @@
 +    my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base();
 +    $location =~ s,^$TeXLiveServerURL,$mirrorbase,;
 +  }
- 
++
    # if we talk about a net location try to download the hash of the tlpdb
    # - if that is possible, check for the locally saved file and if the hash
+   #   agrees load the local copy if present instead of the remote one,
 @@ -4628,6 +4797,8 @@
        close($tlfh);
      }