texlive[49037] Master/tlpkg/TeXLive/TLPSRC.pm: (make_tlpobj): avoid

[commits+karl at tug.org]

Revision: 49037
          http://tug.org/svn/texlive?view=revision&revision=49037
Author:   karl
Date:     2018-10-31 19:11:57 +0100 (Wed, 31 Oct 2018)
Log Message:
-----------
(make_tlpobj): avoid adding self-dep, instead of
removing it after (committing for Norbert).

Modified Paths:
--------------
    trunk/Master/tlpkg/TeXLive/TLPSRC.pm

Modified: trunk/Master/tlpkg/TeXLive/TLPSRC.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPSRC.pm	2018-10-31 01:23:12 UTC (rev 49036)
+++ trunk/Master/tlpkg/TeXLive/TLPSRC.pm	2018-10-31 18:11:57 UTC (rev 49037)
@@ -285,6 +285,7 @@
   # convert each fmttrigger to a depend line, if not already present.
   if (defined($tlp->executes)) { # else no fmttriggers
     my @deps = (defined($tlp->depends) ? $tlp->depends : ());
+    my $tlpname = $tlp->name;
     for my $e ($tlp->executes) {
       # we only check for AddFormat lines
       if ($e =~ m/^\s*AddFormat\s+(.*)\s*$/) {
@@ -292,17 +293,13 @@
         if (defined($fmtline{"error"})) {
           tlwarn ("error in parsing $e for return hash: $fmtline{error}\n");
         } else {
-          TeXLive::TLUtils::push_uniq (\@deps, @{$fmtline{'fmttriggers'}});
-          $tlp->depends(@deps);
+          # make sure that we don't add circular deps
+          TeXLive::TLUtils::push_uniq (\@deps,
+            grep { $_ ne $tlpname } @{$fmtline{'fmttriggers'}});
         }
       }
     }
-    # we might have added the package name itself to its dependencies due
-    # to the parse_AddFormat_line. Remove it
-    @deps = (defined($tlp->depends) ? $tlp->depends : ());
-    my $tlpname = $tlp->name;
-    my @newdeps = grep { $_ ne $tlpname } @deps;
-    $tlp->depends(@newdeps);
+    $tlp->depends(@deps);
   }
 
   my $filemax;