make import bugzilla compatible to latest pybugz, delete cache files only after download

svn path=/; revision=1457

2 files changed, 20 insertions, 15 deletions

diff --git a/bin/target b/bin/target
index 80510ad..0f03471 100755
--- a/bin/target
+++ b/bin/target
@@ -95,7 +95,10 @@ def print_targets(version, liaisons, prestable, bugno, username):
 
 def cc_arches_to(bugno, username, message, cc_add, auth):
     try:
-        import bugz
+        try:
+            import bugz.bugzilla as bugz
+        except ImportError:
+            import bugz
         import re
     except:
         return
diff --git a/bin/update b/bin/update
index ccad6bf..c57036a 100755
--- a/bin/update
+++ b/bin/update
@@ -36,29 +36,31 @@ fi
 
 
 # Update all cached files
-mkdir -p cache
-cd cache
-rm -f allitems.html{,.gz}
+mkdir -p cache/download.tmp
+cd cache/download.tmp
 
 echo "[DOWNLOAD] MITRE Master database"
 wget ${VERB} http://cve.mitre.org/data/downloads/allitems.html.gz
 gunzip allitems.html.gz
+mv allitems.html ..
 
-echo "==============================================================================="
-echo "[DOWNLOAD] NVD Last Modified file"
-wget --timestamping ${VERB} http://nvd.nist.gov/download/nvdcve-modified.xml
-
+YEARS='modified'
 if [ -n "${FULL}" ] ; then
-    echo "==============================================================================="
-    YEAR=`date +"%Y"`
-    echo "[DOWNLOAD] NVD Database 2002..${YEAR}"
-    for yr in `seq 2002 ${YEAR}`; do
-      [ -f nvdcve-$yr.xml ] || touch nvdcve-$yr.xml
-      wget --timestamping ${VERB} http://nvd.nist.gov/download/nvdcve-$yr.xml || true
-    done
+	YEAR=`date +"%Y"`
+	YEARS="$YEARS `seq ${YEAR} -1 2002`"
 fi
 
 echo "==============================================================================="
+for yr in $YEARS; do
+	echo "[DOWNLOAD] NVD Database '$yr'"
+	cp ../nvdcve-$yr.xml . || touch nvdcve-$yr.xml
+	wget --timestamping ${VERB} http://nvd.nist.gov/download/nvdcve-$yr.xml && mv nvdcve-$yr.xml ..
+done
+
+cd ..
+rmdir download.tmp
+
+echo "==============================================================================="
 echo "[UPDATE] Updating our CVE data"
 NEWLIST="$(mktemp -t cveupdate.XXXXXXXXX)"