Bladeren bron

container: make path resolution fns Windows-only

The new daemon.containerFSView type covers all the use-cases on Linux
with a much more intuitive API, but is not portable to Windows.
Discourage people from using the old and busted functions in new Linux
code by excluding them entirely from Linux builds.

Signed-off-by: Cory Snider <csnider@mirantis.com>
Cory Snider 2 jaren geleden
bovenliggende
commit
dcd6c1d2e2
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1 1
      container/archive_windows.go

+ 1 - 1
container/archive.go → container/archive_windows.go

@@ -18,7 +18,7 @@ func (container *Container) ResolvePath(path string) (resolvedPath, absPath stri
 	if container.BaseFS == "" {
 	if container.BaseFS == "" {
 		return "", "", errors.New("ResolvePath: BaseFS of container " + container.ID + " is unexpectedly empty")
 		return "", "", errors.New("ResolvePath: BaseFS of container " + container.ID + " is unexpectedly empty")
 	}
 	}
-	// Check if a drive letter supplied, it must be the system drive. No-op except on Windows
+	// Check if a drive letter supplied, it must be the system drive.
 	path, err = system.CheckSystemDriveAndRemoveDriveLetter(path)
 	path, err = system.CheckSystemDriveAndRemoveDriveLetter(path)
 	if err != nil {
 	if err != nil {
 		return "", "", err
 		return "", "", err