Fixing error messages when using dockercfg setting

mesosphere-backup · Jul 9, 2014 · 95a7677 · 95a7677
1 parent b5d05dd
commit 95a7677
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/deimos/containerizer/docker.py b/deimos/containerizer/docker.py
@@ -321,12 +321,14 @@ def image_from_system_context(self, launchy):
             if not launchy.needs_observer:
                 opts["account"] = opts["account_libmesos"]
             del opts["account_libmesos"]
+        if "dockercfg" in opts:
+            del opts["dockercfg"]
         return deimos.docker.matching_image_for_host(**opts)
 
     def place_dockercfg(self):
         dockercfg = self.index_settings.dockercfg
         if dockercfg is not None:
-            log.info("Copying to .dockercfg: %q" % dockercfg)
+            log.info("Copying to .dockercfg: %s" % dockercfg)
             Run()(["cp", dockercfg, ".dockercfg"])
 
 def url_to_image(url):