Backup existing .hint in fix-skip-only-hint

Also arrange for calm to ignore those .bak files

Also fix a latent bug when more than one ignorable file exists for a
package

2 files changed, 5 insertions, 3 deletions

diff --git a/calm/fix-skip-only-hint.py b/calm/fix-skip-only-hint.py
index 9f3c49c..4ea0b1b 100644
--- a/calm/fix-skip-only-hint.py
+++ b/calm/fix-skip-only-hint.py
@@ -30,6 +30,7 @@
 import argparse
 import os
 import re
+import shutil
 import sys
 
 from . import common_constants
@@ -169,6 +170,7 @@ def fix_one_hint(dirpath, hintfile, vr, later_vrs):
         hints['sdesc'] = '"' + sdesc + '"'
 
     print('writing invented hints for %s' % (hintfile))
+    shutil.copy2(os.path.join(dirpath, hintfile), os.path.join(dirpath, hintfile + '.bak'))
     hint_file_write(os.path.join(dirpath, hintfile), hints)
 
     return (1, 1)
diff --git a/calm/package.py b/calm/package.py
index 838e4fc..7e7bb6a 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -329,9 +329,9 @@ def read_package(packages, basedir, dirpath, files, remove=[]):
             hints[ovr] = hintobj
             actual_tars[ovr] = tars[vr]
 
-        # ignore dotfiles
-        for f in files:
-            if f.startswith('.'):
+        # ignore dotfiles and backup files
+        for f in files[:]:
+            if f.startswith('.') or f.endswith('.bak'):
                 files.remove(f)
 
         # warn about unexpected files, including tarfiles which don't match the