Merge remote-tracking branch 'origin/master' into add-time-to-http-error

nicoddemus · Nov 24, 2016 · 9b2d0e0 · 9b2d0e0
2 parents 95a8574 + 8c92cc9
commit 9b2d0e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/conda/gateways/disk/read.py b/conda/gateways/disk/read.py
@@ -46,14 +46,14 @@ def collect_all_info_for_package(extracted_package_directory):
     info_dir = join(extracted_package_directory, 'info')
 
     files_path = join(extracted_package_directory, 'info', 'files')
-    file_json_path = join(extracted_package_directory, 'info', 'files.json')
+    file_json_path = join(extracted_package_directory, 'info', 'paths.json')
 
     if isfile(file_json_path):
         with open(file_json_path) as file_json:
             data = json.load(file_json)
         if data.get('paths_version') != 1:
             raise CondaUpgradeError("""The current version of conda is too old to install this
-package. (This version only supports files.json schema version 1.)  Please update conda to install
+package. (This version only supports paths.json schema version 1.)  Please update conda to install
 this package.""")
 
         paths = (PathInfoV1(**f) for f in data['paths'])

diff --git a/conda/models/package_info.py b/conda/models/package_info.py
@@ -21,7 +21,7 @@ class NoarchInfo(Entity):
 class PathType(Enum):
     """
     Refers to if the file in question is hard linked or soft linked. Originally designed to be used
-    in files.json
+    in paths.json
     """
     hardlink = 'hardlink'
     softlink = 'softlink'