Re: SVN texlive (2012) commit: r5491 - in texlive2012: . texlive-nonbin/trunk/texlive-base/debian texlive-nonbin/trunk/texlive-base/debian/patches

[Frank Kuester <frank@kuesterei.ch>]

Hi Norbert,

Norbert Preining <preining@alioth.debian.org> writes:

> Modified:
>    texlive2012/TODO
>    texlive2012/texlive-nonbin/trunk/texlive-base/debian/changelog
>    texlive2012/texlive-nonbin/trunk/texlive-base/debian/patches/debian_updmap-search-path
> Log:
> update debian updmap patch for new updmap.pl and give big fat warning
> when running updmap --syncwithtrees

I wanted to check why you only give a warning and don't exit, but the
patch fails here:

texlive-base-2012.20120516$ quilt push
Applying patch debian_updmap-search-path
patching file texmf/scripts/tetex/updmap.pl
Hunk #1 succeeded at 30 (offset 1 line).
Hunk #2 FAILED at 339.
1 out of 2 hunks FAILED -- rejects in file texmf/scripts/tetex/updmap.pl
Patch debian_updmap-search-path does not apply (enforce with -f)

This is in a tree that I got with "apt-get source" from sid, quilt pop,
copy the modified patch there, quilt push.

The patch says it has been produced against the same upstream checkout:

--- texlive-base-2012.20120516.orig/texmf/scripts/tetex/updmap.pl	2012-05-19 14:08:24.411260951 +0900
+++ texlive-base-2012.20120516/texmf/scripts/tetex/updmap.pl	2012-05-19 14:15:53.039738708 +0900

The code is different, the patch looks like this:

         print "\t$m (in $orig)\n";
       }
       print "in $changes_config_file\n";
+      print "
...
+";
       print "Do you really want to continue (y/N)? ";

but the file has a longer print line and no question:

    if (@missing) {
      print "Missing map files found, disabling\n  @missing\nin $changes_config_file\n";
      $changed ||= enable_disable_maps(@missing);

and I don't see why we couldn't just "exit 1" after printing the
message.

Regards, Frank