GitList

Browse code

Mention "or rename" again in error-message.

The "or rename" part was removed from the error-message,
because renaming wasn't possible at the time.

Now that https://github.com/docker/docker/pull/8570 is merged,
renaming existing containers is possible.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2015/01/14 05:57:48
Showing 1 changed files

daemon/daemon.go

History View file @ 78820a6

@@ -542,7 +542,7 @@ func (daemon *Daemon) reserveName(id, name string) (string, error) {
 		} else {
 			nameAsKnownByUser := strings.TrimPrefix(name, "/")
 			return "", fmt.Errorf(
-				"Conflict. The name %q is already in use by container %s. You have to delete that container to be able to reuse that name.", nameAsKnownByUser,
+				"Conflict. The name %q is already in use by container %s. You have to delete (or rename) that container to be able to reuse that name.", nameAsKnownByUser,
 				utils.TruncateID(conflictingContainer.ID))
 		}
 	}

...	...	@@ -542,7 +542,7 @@ func (daemon *Daemon) reserveName(id, name string) (string, error) {
542	542	} else {
543	543	nameAsKnownByUser := strings.TrimPrefix(name, "/")
544	544	return "", fmt.Errorf(
545		- "Conflict. The name %q is already in use by container %s. You have to delete that container to be able to reuse that name.", nameAsKnownByUser,
	545	+ "Conflict. The name %q is already in use by container %s. You have to delete (or rename) that container to be able to reuse that name.", nameAsKnownByUser,
546	546	utils.TruncateID(conflictingContainer.ID))
547	547	}
548	548	}