浏览代码

[Docker API] Do not print warning when maildr does not exist

André 7 年之前
父节点
当前提交
d8148bef79
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      data/Dockerfiles/dockerapi/server.py

+ 1 - 1
data/Dockerfiles/dockerapi/server.py

@@ -132,7 +132,7 @@ class container_post(Resource):
           try:
           try:
             for container in docker_client.containers.list(filters={"id": container_id}):
             for container in docker_client.containers.list(filters={"id": container_id}):
               sane_name = re.sub(r'\W+', '', request.json['maildir'])
               sane_name = re.sub(r'\W+', '', request.json['maildir'])
-              maildir_cleanup = container.exec_run(["/bin/bash", "-c", "/bin/mv '/var/vmail/" + request.json['maildir'].replace("'", "'\\''") + "' '/var/vmail/_garbage/" + str(int(time.time())) + "_" + sane_name + "'"], user='vmail')
+              maildir_cleanup = container.exec_run(["/bin/bash", "-c", "if [[ -d '/var/vmail/" + request.json['maildir'].replace("'", "'\\''") + "' ]]; then /bin/mv '/var/vmail/" + request.json['maildir'].replace("'", "'\\''") + "' '/var/vmail/_garbage/" + str(int(time.time())) + "_" + sane_name + "'; fi"], user='vmail')
               if maildir_cleanup.exit_code == 0:
               if maildir_cleanup.exit_code == 0:
                 return jsonify(type='success', msg=str("moved to garbage"))
                 return jsonify(type='success', msg=str("moved to garbage"))
               else:
               else: