From ccafb2b91cfd8428a4a9ae7fa3c8c2756f8a7cf1 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 29 Oct 2013 18:36:18 +0100
Subject: add support for --deploops option

---
 NEWS              | 2 ++
 pod/8/urpmi.pod   | 4 ++++
 urpm/args.pm      | 1 +
 urpm/install.pm   | 2 +-
 urpm/main_loop.pm | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 5b00b08d..c0b10c48 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 - library:
   o fix parsing download progress with rsync >= 3.10
+- urpmi:
+  o add support for --deploops option (needs URPM-4.29+)
 
 Version 7.27.5 - 13 October 2013, by Colin Guthrie
 
diff --git a/pod/8/urpmi.pod b/pod/8/urpmi.pod
index ac2ac041..5c18cb2f 100644
--- a/pod/8/urpmi.pod
+++ b/pod/8/urpmi.pod
@@ -194,6 +194,10 @@ Proposes a very verbose mode.
 
 Proposes a very verbose mode (similar to rpm -vv)
 
+=item B<--deploops>
+
+Print warnings when packages cannot be ordered properly due to dependancy loops.
+
 =item B<--no-suggests>
 
 With this option, urpmi will not install "suggested" packages. 
diff --git a/urpm/args.pm b/urpm/args.pm
index 86906669..1f43cb49 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -167,6 +167,7 @@ my %options_spec = (
 	'norebuild!' => sub { $urpm->{options}{'build-hdlist-on-error'} = !$_[1] },
 	'test!' => \$::test,
 	'debug__do_not_install' => \$options{debug__do_not_install},
+	deploops => \$options{deploops},
 	'skip=s' => \$options{skip},
 	'prefer=s' => \$options{prefer},
  	'root=s' => sub { set_root($urpm, $_[1]) },
diff --git a/urpm/install.pm b/urpm/install.pm
index de52dca1..8ede436b 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -353,7 +353,7 @@ sub install {
     my ($produced_deltas, @trans_pkgs) = _schedule_packages($urpm, $trans, $install, $upgrade, %options);
 
     if (!$options{nodeps} && (@errors = $trans->check(%options))) {
-    } elsif (!$options{noorder} && (@errors = $trans->order)) {
+    } elsif (!$options{noorder} && (@errors = $trans->order(%options))) {
     } else {
 	$urpm->{readmes} = {};
 
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 9695b9db..a010bc76 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -211,6 +211,7 @@ sub _init_common_options {
   (
       urpm::install::options($urpm),
       test => $test,
+      deploops => $options{deploops},
       verbose => $options{verbose},
       script_fd => $urpm->{options}{script_fd},
       oldpackage => $state->{oldpackage},
-- 
cgit v1.2.1