win: Fix current toolchain path with old packaging

win_toolchain/get_toolchain_if_necessary.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Downloads and unpacks a toolchain for building on Windows. The contents are
 matched by sha1 which will be updated when the toolchain is updated.
 
 Having a toolchain script in depot_tools means that it's not versioned
 directly with the source code. That is, if the toolchain is upgraded, but
@@ skipping 272 matching lines @@
     with open(os.devnull, 'wb') as nul:
       subprocess.call(['taskkill', '/f', '/im', 'mspdbsrv.exe'],
                       stdin=nul, stdout=nul, stderr=nul)
     if os.path.isdir(target_dir):
       subprocess.check_call('rmdir /s/q "%s"' % target_dir, shell=True)
 
     DoTreeMirror(target_dir, desired_hashes[0])
 
     got_new_toolchain = True
 
-  win_sdk = os.path.join(abs_target_dir, 'win_sdk')
+  data = {
+      'path': abs_target_dir,
+      'win_sdk': os.path.join(abs_target_dir, 'win_sdk'),
+      'wdk': os.path.join(abs_target_dir, 'wdk'),
+      'runtime_dirs': [
+        os.path.join(abs_target_dir, 'sys64'),
+        os.path.join(abs_target_dir, 'sys32'),
+      ],
+  }
+
   try:
     with open(os.path.join(target_dir, 'VS_VERSION'), 'rb') as f:
       vs_version = f.read().strip()
   except IOError:
     # Older toolchains didn't have the VS_VERSION file, and used 'win8sdk'
     # instead of just 'win_sdk'.
     vs_version = '2013'
-    win_sdk = os.path.join(abs_target_dir, 'win8sdk')
+    data['win8sdk'] = os.path.join(abs_target_dir, 'win8sdk')
 
-  data = {
-      'path': abs_target_dir,
-      'version': vs_version,
-      'win_sdk': win_sdk,
-      'wdk': os.path.join(abs_target_dir, 'wdk'),
-      'runtime_dirs': [
-        os.path.join(abs_target_dir, 'sys64'),
-        os.path.join(abs_target_dir, 'sys32'),
-      ],
-  }
+  data['version'] = vs_version
+
   with open(os.path.join(target_dir, '..', 'data.json'), 'w') as f:
     json.dump(data, f)
 
   if got_new_toolchain:
     current_hash = CalculateHash(target_dir)
     if current_hash not in desired_hashes:
       print >> sys.stderr, (
           'Got wrong hash after pulling a new toolchain. '
           'Wanted one of \'%s\', got \'%s\'.' % (
               ', '.join(desired_hashes), current_hash))
       return 1
     SaveTimestampsAndHash(target_dir, current_hash)
 
   if options.output_json:
     shutil.copyfile(os.path.join(target_dir, '..', 'data.json'),
                     options.output_json)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())