From: jingui.ren <jingui.ren@samsung.com>
Date: Mon, 29 Oct 2018 08:52:30 +0000 (+0800)
Subject: adjust circle check method
X-Git-Tag: submit/devel/20190730.074511~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7b7c683cc29f0f31f3bdfcc89f0f796d695346a;p=tools%2Fdepanneur.git

adjust circle check method

Change-Id: I664f4fbf1d20f2e629db60e22130fadb3823c236
Signed-off-by: jingui.ren <jingui.ren@samsung.com>
---

diff --git a/depanneur b/depanneur
index afee2d3..4b9a329 100755
--- a/depanneur
+++ b/depanneur
@@ -1403,7 +1403,9 @@ sub get_top_order {
         my @queue = ();
         my @top_order = ();
         my %ref_build_complete = ();
+        my $pkg_number = 0;
         for my $pack (sort keys %pkgddeps) {
+                $pkg_number++;
                 $ref_build_complete{$pack} = 0;
                 my $pack_in_degree = 0;
                 if (defined $pkgddeps{$pack}) {
@@ -1424,7 +1426,14 @@ sub get_top_order {
                         }
                 }
         }
-        return @top_order;
+        if($pkg_number == @top_order) {
+            info("there is no circle in $pkg_number packages");
+            return @top_order;
+        }
+        else {
+            info("circle found in $pkg_number packages, exit...");
+            exit 1;
+        }
 }
 
 #---------------------------------------------------------------------
@@ -1506,10 +1515,10 @@ sub update_pkgddeps {
         }
     }
 
-    if (check_circle() == 1) {
-        info("circle found, exit...");
-        exit 1;
-    }
+    #if (check_circle() == 1) {
+    #    info("circle found, exit...");
+    #    exit 1;
+    #}
 
     # Expand dependency using direct dependency dict
     # pkgddeps  => pkgdeps
@@ -2770,10 +2779,10 @@ if ($noinit == 1 || $incremental == 1) {
 }
 
 
-if (check_circle() == 1) {
-    info("circle found, exit...");
-    exit 1;
-}
+#if (check_circle() == 1) {
+#    info("circle found, exit...");
+#    exit 1;
+#}
 
 if ($debug) {
     my $pkg;