From 907440d12c742a80f7e22f7801fd36645d1e6d77 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 23 Jan 2015 11:56:44 +0100
Subject: [PATCH] Simplify option handling in create_venv().

See #463.
---
 scripts/init_venv.py | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/scripts/init_venv.py b/scripts/init_venv.py
index 3cd49b8f5..b7955784c 100644
--- a/scripts/init_venv.py
+++ b/scripts/init_venv.py
@@ -142,21 +142,14 @@ def link_pyqt():
 def create_venv():
     """Create a new venv."""
     utils.print_title("Creating venv")
-
     system_site_packages = True
-
-    clear = False
-    if g_args.clear or g_args.force:
-        clear = True
-
-    upgrade = False
-    if g_args.upgrade:
-        upgrade = True
-
-    symlinks = False if os.name == 'nt' else True
-
+    if os.name == 'nt':
+        symlinks = False
+    else:
+        symlinks = True
+    clear = g_args.clear or g_args.force
     builder = venv.EnvBuilder(system_site_packages=system_site_packages,
-                              clear=clear, upgrade=upgrade,
+                              clear=clear, upgrade=g_args.upgrade,
                               symlinks=symlinks, with_pip=True)
     builder.create(g_path)