From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 9563B3858D37; Sat, 22 Jan 2022 20:08:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9563B3858D37 To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20210626-10-g3d580a6 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f327e7dd59641a89bcf58735964350238fa7c498 X-Git-Newrev: 3d580a6eaeb6ee8490183f0f29d2cdb462863091 Message-Id: <20220122200822.9563B3858D37@sourceware.org> Date: Sat, 22 Jan 2022 20:08:22 +0000 (GMT) From: Jon TURNEY X-BeenThere: cygwin-apps-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin-apps git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Jan 2022 20:08:22 -0000 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=3d580a6eaeb6ee8490183f0f29d2cdb462863091 commit 3d580a6eaeb6ee8490183f0f29d2cdb462863091 Author: Jon Turney Date: Sat Jan 22 20:04:17 2022 +0000 Leave stale sha512.sum in place to be recomputed by 'make-sha' We can't replace sha512.sum atomically because it's owned by root, so just leave it in place. 'make-sha' is smart enough to change it's contents only when necessary. Diff: --- calm/calm.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/calm/calm.py b/calm/calm.py index 731bb7b..cfc05dd 100755 --- a/calm/calm.py +++ b/calm/calm.py @@ -462,17 +462,6 @@ def do_output(args, state): keys = ' '.join(['-u' + k for k in args.keys]) utils.system('/usr/bin/gpg ' + keys + ' --batch --yes -b ' + extfile) - # recompute checksums - files = ['setup' + ext for ext in extensions] + ['setup' + ext + '.sig' for ext in extensions] + ['setup.ini.bak'] - - hashfile = os.path.join(basedir, 'sha512.sum') - with tempfile.NamedTemporaryFile(mode='w', delete=False) as tmphashfile: - for fn in sorted(files): - sha512 = package.sha512_file(os.path.join(basedir, fn)) - print('%s %s' % (sha512, fn), file=tmphashfile) - logging.info("moving %s to %s" % (tmphashfile.name, hashfile)) - shutil.move(tmphashfile.name, hashfile) - else: logging.debug("removing %s, unchanged %s" % (tmpfile.name, inifile)) os.remove(tmpfile.name)