summaryrefslogtreecommitdiff
path: root/Master/tlpkg/dev
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2011-10-28 23:58:36 +0000
committerNorbert Preining <preining@logic.at>2011-10-28 23:58:36 +0000
commit030d3a77cae208821660752665c93f6e2ee709f6 (patch)
tree461268b2041e8803c55db9fb46941dd7e99ad84b /Master/tlpkg/dev
parent3bd47cfb6876893f3fc9f4a76d83dd8beca78ecd (diff)
update multi-source patch
git-svn-id: svn://tug.org/texlive/trunk@24434 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/dev')
-rw-r--r--Master/tlpkg/dev/dev.multi-source-support-v2.patch56
1 files changed, 2 insertions, 54 deletions
diff --git a/Master/tlpkg/dev/dev.multi-source-support-v2.patch b/Master/tlpkg/dev/dev.multi-source-support-v2.patch
index 365162a3492..0702f389450 100644
--- a/Master/tlpkg/dev/dev.multi-source-support-v2.patch
+++ b/Master/tlpkg/dev/dev.multi-source-support-v2.patch
@@ -1,6 +1,6 @@
Index: tlpkg/TeXLive/TLPDB.pm
===================================================================
---- tlpkg/TeXLive/TLPDB.pm (revision 23788)
+--- tlpkg/TeXLive/TLPDB.pm (revision 24382)
+++ tlpkg/TeXLive/TLPDB.pm (working copy)
@@ -70,20 +70,31 @@
$tlpdb->settings;
@@ -929,61 +929,9 @@ Index: tlpkg/TeXLive/TLPDB.pm
=pod
=head1 OPTIONS
-Index: tlpkg/TeXLive/TLUtils.pm
-===================================================================
---- tlpkg/TeXLive/TLUtils.pm (revision 23788)
-+++ tlpkg/TeXLive/TLUtils.pm (working copy)
-@@ -62,6 +62,7 @@
- TeXLive::TLUtils::setup_programs($bindir, $platform);
- TeXLive::TLUtils::tlcmp($file, $file);
- TeXLive::TLUtils::nulldev();
-+ TeXLive::TLUtils::get_full_line($fh);
-
- =head2 Installer Functions
-
-@@ -184,6 +185,7 @@
- &setup_persistent_downloads
- &mktexupd
- &nulldev
-+ &get_full_line
- );
- @EXPORT = qw(setup_programs download_file process_logging_options
- tldie tlwarn info log debug ddebug dddebug debug_hash
-@@ -2438,6 +2440,31 @@
- return (&win32)? 'nul' : '/dev/null';
- }
-
-+=item C<get_full_line ($fh)>
-+
-+returns the next line from the file handle $fh, taking
-+continuation lines into account (last character of a line is \, and
-+no quoting is parsed).
-+
-+=cut
-+
-+# open my $f, '<', $file_name or die;
-+# while (my $l = get_full_line($f)) { ... }
-+# close $f or die;
-+sub get_full_line {
-+ my ($fh) = @_;
-+ my $line = <$fh>;
-+ return undef unless defined $line;
-+ return $line unless $line =~ s/\\\r?\n$//;
-+ my $cont = get_full_line($fh);
-+ if (!defined($cont)) {
-+ tlwarn('Continuation disallowed at end of file');
-+ $cont = "";
-+ }
-+ $cont =~ s/^\s*//;
-+ return $line . $cont;
-+}
-+
-
- =back
-
Index: texmf/scripts/texlive/tlmgr.pl
===================================================================
---- texmf/scripts/texlive/tlmgr.pl (revision 23788)
+--- texmf/scripts/texlive/tlmgr.pl (revision 24382)
+++ texmf/scripts/texlive/tlmgr.pl (working copy)
@@ -124,6 +124,7 @@
"package-logfile" => "=s",