Fix bug in gyp_webrtc.py when DEPOT_TOOLS_WIN_TOOLCHAIN=0

webrtc/build/gyp_webrtc.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
@@ skipping 68 matching lines @@
   if not os.environ.get('GYP_GENERATORS'):
     os.environ['GYP_GENERATORS'] = 'ninja'
 
   # Enable check for missing sources in GYP files on Windows.
   if sys.platform.startswith('win'):
     gyp_generator_flags = os.getenv('GYP_GENERATOR_FLAGS', '')
     if not 'msvs_error_on_missing_sources' in gyp_generator_flags:
       os.environ['GYP_GENERATOR_FLAGS'] = (
           gyp_generator_flags + ' msvs_error_on_missing_sources=1')
 
-  vs2013_runtime_dll_dirs = None, None
+  vs2013_runtime_dll_dirs = None
   if int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')):
     vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
 
   # Enforce gyp syntax checking. This adds about 20% execution time.
   args.append('--check')
 
   supplemental_includes = GetSupplementalFiles()
   gyp_vars = gyp_chromium.GetGypVars(supplemental_includes)
 
   # Automatically turn on crosscompile support for platforms that need it.
   if all(('ninja' in os.environ.get('GYP_GENERATORS', ''),
           gyp_vars.get('OS') in ['android', 'ios'],
           'GYP_CROSSCOMPILE' not in os.environ)):
     os.environ['GYP_CROSSCOMPILE'] = '1'
 
   args.extend(['-I' + i for i in
                gyp_chromium.additional_include_files(supplemental_includes,
                                                      args)])
 
   # Set the gyp depth variable to the root of the checkout.
   args.append('--depth=' + os.path.relpath(checkout_root))
 
   print 'Updating projects from gyp files...'
   sys.stdout.flush()
 
   # Off we go...
   gyp_rc = gyp.main(args)
 
   if vs2013_runtime_dll_dirs:
+    # pylint: disable=unpacking-non-sequence
     x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
     vs_toolchain.CopyVsRuntimeDlls(
         os.path.join(checkout_root, gyp_chromium.GetOutputDirectory()),
         (x86_runtime, x64_runtime))
 
   sys.exit(gyp_rc)
 
 
 if __name__ == '__main__':
   sys.exit(main())