From: Hyokeun Jeon Date: Wed, 24 Mar 2021 03:20:26 +0000 (+0900) Subject: always call bsr X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=387e6b0fab8ecc18b902b83cefc4ebbc519b59bc;p=tools%2Fdepanneur.git always call bsr --- diff --git a/debian/changelog b/debian/changelog index 863c3e0..847d180 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -depanneur (0.16.10.4) unstable; urgency=high +depanneur (0.16.10.5) unstable; urgency=high - * Upgrade to 0.16.10.4 + * Upgrade to 0.16.10.5 * BSR support -- Hyokeun Jeon Mon, 23 Mar 2021 10:00:00 +0800 diff --git a/depanneur b/depanneur index 55d9b02..166f431 100755 --- a/depanneur +++ b/depanneur @@ -2590,22 +2590,17 @@ sub prepare_preorder_list { if ($preordered_list ne "") { @preview_orders = split /[:,\s\/]+/, $preordered_list; - info("Preordered list given"); } my $preview_command = ""; if ($profiling_reference ne "") { - info("Profiling reference given"); - $preview_command = "bsr reorder -j $profiling_reference --verbose "; + $preview_command = "bsr reorder -j $profiling_reference "; } elsif (@preview_orders <= 0) { - info("Order list is empty.. Start call bsr"); generate_depends_xmlfile(); my $dep_xml_file = "$depends_dir/$dist/$arch/$dist\_$arch\_pkgdepends.xml"; - info("Depend finished..."); if (-e $dep_xml_file) { - info("Dep file found..."); - $preview_command = "bsr preview -a $arch --verbose --depsnumbersort "; + $preview_command = "bsr preview -a $arch --depsnumbersort "; $preview_command = $preview_command . " -x \"$dep_xml_file\" "; my $candidate_ref = ""; foreach my $r (@package_repos) { @@ -2618,15 +2613,13 @@ sub prepare_preorder_list { $preview_command = $preview_command . " -r \"$candidate_ref\" --criticalsort "; } } + } else { + $preview_command = "bsr reorder -j non/exists/path "; } if ($preview_command ne "") { my_system($preview_command); - info(""); - info($preview_command); - info(""); - my $preview_config = ""; if (-f ".bsr.preview.yaml") { $preview_config = LoadFile(".bsr.preview.yaml"); @@ -2635,9 +2628,6 @@ sub prepare_preorder_list { && $preview_config->{preview} && $preview_config->{preview}->{packages} && @{$preview_config->{preview}->{packages}} > 0) { - - info("We have preview orders... " . @{$preview_config->{preview}->{packages}}); - foreach my $p (@{$preview_config->{preview}->{packages}}) { if ( !(grep $_ eq $p, @preview_orders) ) { push @preview_orders, $p; @@ -2650,7 +2640,6 @@ sub prepare_preorder_list { } } else { $preview_config = ""; - info("No .bsr.preview.yaml file found"); } }