From 8a460c554f524cdfff1d2145f4e4153e58ccf0a9 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Fri, 5 Jul 2019 16:46:11 +0200
Subject: [PATCH] Solve dependency issues

---
 flavor | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/flavor b/flavor
index 640cb17..f091e81 100755
--- a/flavor
+++ b/flavor
@@ -148,17 +148,15 @@ sub create_graph {
     my %top = ();
     my %dict = ();
     my %parents = ();
+    my %done = ();
 
     while (my $image = shift @images) {
+	$done{$image} = 1;
         my @curr_parents = get_from($image);
         print "DEBUG: $image depends on: " . join(" ", @curr_parents). "\n";
         my $is_top = 1;
         for my $parent (@curr_parents) {
           my ($repo, $name) = split('/', $parent, 2) if $parent;
-	  if (defined($parents{$name}) || any {$name} @images) {
-            next;
-	  }
-
           if (!$parent or $repo ne $options->{repo} or $options->{exclude}{$name} or !-f "$dir/$name/Dockerfile") {
               ;
           }
@@ -175,7 +173,10 @@ sub create_graph {
               }
 
               push @{$parents{$name}}, ($image);
-	      push @images, ($name);
+
+	      if (!defined($done{$name}) && !any {$name} @images) {
+	        push @images, ($name);
+              }
           }
         }