From 4c1c38a33f669ce09fe9b6cd046b270cf70253ac Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 18 Aug 2011 18:36:17 +0900
Subject: [PATCH] Ignore --out option supplied in command-line if -i is used.

You can still use out option in the text file specified in -i.
---
 src/download_helper.cc     | 1 +
 test/DownloadHelperTest.cc | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/download_helper.cc b/src/download_helper.cc
index 08a7e614..e563221d 100644
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@@ -517,6 +517,7 @@ void createRequestGroupForUriList
     }
 
     SharedHandle<Option> requestOption(new Option(*option.get()));
+    requestOption->remove(PREF_OUT);
     for(std::set<std::string>::const_iterator i =
           listRequestOptions().begin(), eoi = listRequestOptions().end();
         i != eoi; ++i) {
diff --git a/test/DownloadHelperTest.cc b/test/DownloadHelperTest.cc
index 1fae01e1..72c263f7 100644
--- a/test/DownloadHelperTest.cc
+++ b/test/DownloadHelperTest.cc
@@ -302,8 +302,8 @@ void DownloadHelperTest::testCreateRequestGroupForUriList()
 
   SharedHandle<RequestGroup> fileISOGroup = result[1];
   SharedHandle<DownloadContext> fileISOCtx = fileISOGroup->getDownloadContext();
-  CPPUNIT_ASSERT_EQUAL(std::string("/tmp/file.out"),
-                       fileISOCtx->getBasePath());
+  // PREF_OUT in option_ must be ignored.
+  CPPUNIT_ASSERT_EQUAL(std::string(), fileISOCtx->getBasePath());
 }
 
 #ifdef ENABLE_BITTORRENT