From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 3 Dec 2013 12:11:20 +0000 (+0100)
Subject: [configuration] Undo code breakage
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=a0eaa341e1ce6254179c1a00a11704da1887e124;p=youtube-dl

[configuration] Undo code breakage
---

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 9c8a694f0..fff295e8c 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -87,7 +87,9 @@ def parseOpts(overrideArguments=None):
         except IOError:
             return default  # silently skip if file is not present
         try:
-            res = [shlex.split(l, comments=True) for l in optionf]
+            res = []
+            for l in optionf:
+                res += shlex.split(l, comments=True)
         finally:
             optionf.close()
         return res