[calm - Cygwin server-side packaging maintenance script] branch master, updated. bc6fd68b03e262b18b5dc6079fb609ac0b181e84

jturney@sourceware.org jturney@sourceware.org
Wed Mar 23 13:09:00 GMT 2016




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=bc6fd68b03e262b18b5dc6079fb609ac0b181e84

commit bc6fd68b03e262b18b5dc6079fb609ac0b181e84
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Mar 23 10:26:55 2016 +0000

    Ignore packages marked as OBSOLETE in cygwin-pkg-maint
    
    Update tests appropriately

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=e7eb9c334ff2db9b4a622959b74126d5880ef52d

commit e7eb9c334ff2db9b4a622959b74126d5880ef52d
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon Mar 21 20:37:40 2016 +0000

    Remove shell script, do everything in python
    
    Have I mentioned lately how much I hate shell scripts...
    
    v2:
    Backup existing .ini file, rather than overwriting it
    Add an option to control where we look for setup executable
    
    v3:
    Use shutil.move rather than os.rename for case when /tmp isn't on the
    same filesystem as release area


Diff:
---
 calm.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/calm.py b/calm.py
index 6cbc690..f1b6b2d 100755
--- a/calm.py
+++ b/calm.py
@@ -185,7 +185,7 @@ def main(args):
 
                     # replace setup.ini
                     logging.warning("moving %s to %s" % (tmpfile.name, inifile))
-                    os.rename(tmpfile.name, inifile)
+                    shutil.move(tmpfile.name, inifile)
 
                     # compress and re-sign
                     for ext in ['.ini', '.bz2']:



More information about the Cygwin-apps-cvs mailing list