[latex3-commits] [git/LaTeX3-latex3-latex2e] gh516: Avoid warning when loading a file using a generic rule (ab0cb06c)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : gh516
Link       : https://github.com/latex3/latex2e/commit/ab0cb06c45dd7beca0569a1b4004e5a1d5de0a70

>---------------------------------------------------------------

commit ab0cb06c45dd7beca0569a1b4004e5a1d5de0a70
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Thu Mar 4 00:02:01 2021 -0300

    Avoid warning when loading a file using a generic rule
    
    Fixes #516


>---------------------------------------------------------------

ab0cb06c45dd7beca0569a1b4004e5a1d5de0a70
 required/graphics/changes.txt               | 4 ++++
 required/graphics/graphics.dtx              | 8 ++++++--
 required/graphics/testfiles/github-0516.tlg | 1 -
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/required/graphics/changes.txt b/required/graphics/changes.txt
index 92cdab1c..6f608f2a 100644
--- a/required/graphics/changes.txt
+++ b/required/graphics/changes.txt
@@ -4,6 +4,10 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2021-03-03  Phelype Oleinik  <phelype.oleinik at latex-project.org>
+
+	* graphics.dtx: Avoid warning when loading a file using a generic rule (gh/516).
+
 ================================================================================
 All changes above are only part of the development branch for the next release.
 ================================================================================
diff --git a/required/graphics/graphics.dtx b/required/graphics/graphics.dtx
index 88c9ae3b..d2fb53df 100644
--- a/required/graphics/graphics.dtx
+++ b/required/graphics/graphics.dtx
@@ -27,7 +27,7 @@
 %<driver> \ProvidesFile{graphics.drv}
 % \fi
 %         \ProvidesFile{graphics.dtx}
-          [2020/08/30 v1.4c  Standard LaTeX Graphics (DPC,SPQR)]
+          [2020/08/30 v1.4d  Standard LaTeX Graphics (DPC,SPQR)]
 %
 % \iffalse
 %<*driver>
@@ -1148,14 +1148,17 @@
 %     {Try adding an extension even if the filename had a dot AND
 %      if the filename without the extension exists (but doesn't have
 %      a known extension).}
+% \changes{v1.4d}{2021/03/03}
+%     {Avoid warning when loading a file using a generic rule.}
 %    \begin{macrocode}
     \ifnum0%
         \ifx\Gin at ext\relax 1%
         \else \@ifundefined{Gin at rule@\Gin at ext}{1}{0}%
         \fi >0
-      \let\Gin at ext\relax
+      \let\Gin at extsaved\Gin at ext
       \let\Gin at savedbase\filename at base
       \let\Gin at savedext\filename at ext
+      \let\Gin at ext\relax
       \edef\filename at base{\filename at base\Gin at sepdefault\filename at ext}%
       \let\filename at ext\relax
       \@for\Gin at temp:=\Gin at extensions\do{%
@@ -1166,6 +1169,7 @@
 % Restore if no file found using the known extensions.
 %    \begin{macrocode}
       \ifx\Gin at ext\relax
+        \let\Gin at ext\Gin at extsaved
         \let\filename at base\Gin at savedbase
         \let\filename at ext\Gin at savedext
       \fi
diff --git a/required/graphics/testfiles/github-0516.tlg b/required/graphics/testfiles/github-0516.tlg
index 6375aeb4..65cd5d20 100644
--- a/required/graphics/testfiles/github-0516.tlg
+++ b/required/graphics/testfiles/github-0516.tlg
@@ -1,6 +1,5 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-LaTeX Warning: File `graph-test.1' not found on input line ....
 File: graph-test.1 Graphic file (type eps)
 <graph-test.1>
 > \box...=