Merge ~alexmurray/ubuntu-cve-tracker:catch-duplicate-usns into ubuntu-cve-tracker:master

[Alex Murray]

This is designed to go with https://code.launchpad.net/~alexmurray/usn-tool/+git/usn-tool/+merge/375314

[Alex Murray (alexmurray)]

Approving and merging myself due to lack of feedback.

review: Approve

diff --git a/scripts/sis-generate-usn b/scripts/sis-generate-usn
index ba30390..dfe452b 100755
--- a/scripts/sis-generate-usn
+++ b/scripts/sis-generate-usn
@@ -512,6 +512,20 @@ print('export PATH=$PATH:%s' % (config['usn_tool']))
 print('export USN=%s'%(usn))
 print('export DB="--db %s"'%(local_pickle))
 print('umask 0002')
+print()
+print('# check for known command-line arguments')
+print('FORCE=""')
+print('case $@ in')
+print('    --force)')
+print('    FORCE="--force"')
+print('    ;;')
+print('    "")')
+print('    ;;')
+print('    *)')
+print('    echo Ignoring unknown command-line argument "$@"...')
+print('    ;;')
+print('esac')
+print()
 print('echo Recording USN-$USN ...')
 print('# Wipe out the old one -- we want to create a fresh one')
 print('rm -f %s'%(local_pickle))
@@ -828,16 +842,24 @@ for release in releases:
                 print('  usn.py $DB $USN --release %s --package %s --all-binary-version %s' % (release,deb,version))
         print()
 
+# refresh the local db so when we do an import we can catch cases where a
+# duplicate USN is used before we go to push it to the remote master DB
+print('# Refresh the local DB')
+print('echo Refreshing local master USN database ...')
+print('pushd %s' % (os.path.dirname(config['usn_db_copy'])))
+print('%s/scripts/fetch-db %s' % (os.environ['UCT'], os.path.basename(config['usn_db_copy'])))
+print('popd')
+
 print('# Update the local DB')
 print('echo Updating local master USN database ...')
-print("usn.py $DB --export | usn.py --db %s --import" % (config['usn_db_copy']))
+print("usn.py $DB --export | usn.py --db %s --import $FORCE" % (config['usn_db_copy']))
 
 print('# Check local DB for unfilled templates')
 print('%s/scripts/check-unreplaced-templates.py %s $USN' % (os.environ['UCT'], config['usn_db_copy']))
 
 print('# Update the remote DB')
 print('echo Updating remote master USN database and sending template email ...')
-print("usn.py $DB --export | ssh -C people.canonical.com '/home/ubuntu-security/bin/usn.sh --db /home/ubuntu-security/usn/database-all.pickle --import && /home/ubuntu-security/bin/send-usn-email '\"$USN\"")
+print("usn.py $DB --export | ssh -C people.canonical.com '/home/ubuntu-security/bin/usn.sh --db /home/ubuntu-security/usn/database-all.pickle --import $FORCE && /home/ubuntu-security/bin/send-usn-email '\"$USN\"")
 
 #import pprint
 #pp = pprint.PrettyPrinter(indent=4)