From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 71509 invoked by alias); 7 Sep 2017 18:30:55 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 71483 invoked by uid 9795); 7 Sep 2017 18:30:54 -0000 Date: Thu, 07 Sep 2017 18:30:00 -0000 Message-ID: <20170907183054.71453.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-89-gb44d6da X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 712cd32bb1f06314c74e9a76445d88a79a8a792f X-Git-Newrev: b44d6da5c9b87e64c882729fce52e139b5c91641 X-SW-Source: 2017-q3/txt/msg00012.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=b44d6da5c9b87e64c882729fce52e139b5c91641 commit b44d6da5c9b87e64c882729fce52e139b5c91641 Author: Yaakov Selkowitz Date: Thu Sep 7 18:19:37 2017 +0000 Update past_mistakes https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=73f7e6418929f51e0f96efec89500abb93c97589 commit 73f7e6418929f51e0f96efec89500abb93c97589 Author: Jon Turney Date: Tue Aug 15 14:35:21 2017 +0100 Tolerate trying to delete non-existent files This avoids a crash if a !ready file is removed via sftp after calm has noticed it Diff: --- calm/past_mistakes.py | 17 ++++++++++++++++- calm/uploads.py | 5 ++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py index c79c0c0..ab925a1 100644 --- a/calm/past_mistakes.py +++ b/calm/past_mistakes.py @@ -107,16 +107,30 @@ self_source = [ nonunique_versions = [ 'bzr-debuginfo', # debuginfo from NMU needs to age out 'cgdb-debuginfo', # debuginfo from NMU needs to age out + 'dolphin', # split out from kde-baseapps + 'dolphin4', # dropped from kde-baseapps + 'gcc-java', # dropped from gcc 6 'girepository-SpiceClientGtk2.0', # gtk2 dropped from spice-gtk 'gnome-panel-doc', 'gtk2.0-engines-svg', 'guile-doc', 'guile-gv', # dropped pending guile-2 'info', # something went wrong with package build? - 'libatomic_ops-devel', # separated out from libgc + 'kdepasswd', # dropped from split kde-baseapps + 'kdialog', # split out from kde-baseapps + 'keditbookmarks', # split out from kde-baseapps + 'kexi', # split out from calligra + 'kfind', # split out from kde-baseapps + 'kfilereplace', # split out from kdewebdev 'khelpcenter', # split out from kde-runtime + 'kimagemapeditor', # split out from kdewebdev + 'klinkstatus', # split out from kdewebdev + 'konqueror', # split out from kde-baseapps + 'konqueror-devel', # split out from kde-baseapps + 'libatomic_ops-devel', # separated out from libgc 'libcaca-doc', # dropped pending fix for current doxygen 'libfltk-doc', + 'libgcj-common', # dropped from gcc 6 'libical_cxx-devel', 'libquota-devel', # no longer provided by e2fsprogs 'libturbojpeg', # no number means it isn't considered an old soversion @@ -126,6 +140,7 @@ nonunique_versions = [ 'mutter-doc', 'ocaml-camlp4', # ocaml-camlp4 removed from ocaml distribution after 4.01.0 'ocaml-gv', # dropped pending ocaml cleanup + 'okular4-part', # changed to okular5-part in 17.04 'python-clang', # split out from clang 'python3-clang', # split out from clang 'python-spiceclientgtk', # gtk2 dropped from spice-gtk diff --git a/calm/uploads.py b/calm/uploads.py index 61a3d04..a8a2660 100644 --- a/calm/uploads.py +++ b/calm/uploads.py @@ -242,7 +242,10 @@ def remove(args, remove): for f in remove: logging.debug("rm %s", f) if not args.dryrun: - os.unlink(f) + try: + os.unlink(f) + except FileNotFoundError: + logging.error("%s can't be deleted as it doesn't exist" % (f)) #