summaryrefslogtreecommitdiff
path: root/net/rtorrent/patches/patch-ag
diff options
context:
space:
mode:
Diffstat (limited to 'net/rtorrent/patches/patch-ag')
-rw-r--r--net/rtorrent/patches/patch-ag15
1 files changed, 8 insertions, 7 deletions
diff --git a/net/rtorrent/patches/patch-ag b/net/rtorrent/patches/patch-ag
index ba336770399..d7403833844 100644
--- a/net/rtorrent/patches/patch-ag
+++ b/net/rtorrent/patches/patch-ag
@@ -1,21 +1,22 @@
-$NetBSD: patch-ag,v 1.1 2011/07/30 17:06:33 tron Exp $
+$NetBSD: patch-ag,v 1.2 2012/05/16 17:42:37 tron Exp $
Fix handling of command line options. Please look here for details:
http://libtorrent.rakshasa.no/ticket/2657
---- src/main.cc.orig 2011-06-12 07:43:04.000000000 +0100
-+++ src/main.cc 2011-07-30 17:21:50.000000000 +0100
-@@ -822,13 +822,13 @@
+--- src/main.cc.orig 2012-03-20 15:09:58.000000000 +0000
++++ src/main.cc 2012-05-14 23:44:41.000000000 +0100
+@@ -843,14 +843,14 @@
}
#endif
- int firstArg = parse_options(control, argc, argv);
-
- if (OptionParser::has_flag('n', argc, argv))
- control->core()->push_log("Ignoring ~/.rtorrent.rc.");
- else
+ if (OptionParser::has_flag('n', argc, argv)) {
+ lt_log_print(torrent::LOG_WARN, "Ignoring ~/.rtorrent.rc.");
+ } else {
rpc::parse_command_single(rpc::make_target(), "try_import = ~/.rtorrent.rc");
+ }
+ int firstArg = parse_options(control, argc, argv);
+