瀏覽代碼

Merge pull request #34983 from thaJeztah/suppress-tmp-rename-warning

Suppress warning for renaming missing tmp directory
Sebastiaan van Stijn 7 年之前
父節點
當前提交
6523459721
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      daemon/daemon.go

+ 1 - 1
daemon/daemon.go

@@ -1044,7 +1044,7 @@ func prepareTempDir(rootDir string, rootIDs idtools.IDPair) (string, error) {
 					logrus.Warnf("failed to delete old tmp directory: %s", newName)
 					logrus.Warnf("failed to delete old tmp directory: %s", newName)
 				}
 				}
 			}()
 			}()
-		} else {
+		} else if !os.IsNotExist(err) {
 			logrus.Warnf("failed to rename %s for background deletion: %s. Deleting synchronously", tmpDir, err)
 			logrus.Warnf("failed to rename %s for background deletion: %s. Deleting synchronously", tmpDir, err)
 			if err := os.RemoveAll(tmpDir); err != nil {
 			if err := os.RemoveAll(tmpDir); err != nil {
 				logrus.Warnf("failed to delete old tmp directory: %s", tmpDir)
 				logrus.Warnf("failed to delete old tmp directory: %s", tmpDir)