aboutsummaryrefslogtreecommitdiff
path: root/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff
diff options
context:
space:
mode:
Diffstat (limited to 'python/python-vulndb/do-not-commit-vulndb-to-upstream.diff')
-rw-r--r--python/python-vulndb/do-not-commit-vulndb-to-upstream.diff24
1 files changed, 15 insertions, 9 deletions
diff --git a/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff b/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff
index 6fb65be81eee..23c232f5d692 100644
--- a/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff
+++ b/python/python-vulndb/do-not-commit-vulndb-to-upstream.diff
@@ -1,10 +1,11 @@
-
-Removes git commits to vulndb since it seems to be broken
-Tracks vulndb repository in /tmp/vulndb_data
-
---- vulndb-0.0.19.orig/tools/update-db.sh 2015-11-17 22:47:34.506772912 -0700
-+++ vulndb-0.0.19/tools/update-db.sh 2015-11-17 22:54:12.818745899 -0700
-@@ -5,25 +5,13 @@
+--- vulndb-0.0.19.orig/tools/update-db.sh 2016-12-17 22:06:14.959661248 +0000
++++ vulndb-0.0.19/tools/update-db.sh 2016-12-17 22:26:36.641608883 +0000
+@@ -1,29 +1,23 @@
+ #!/usr/bin/env bash
+
+-set -x
++set -xe
+
#
# Update the database
#
@@ -30,9 +31,14 @@ Tracks vulndb repository in /tmp/vulndb_data
-cd data
-git rev-parse HEAD > ../vulndb/db-version.txt
-cd ..
--
++if [ -d "/usr/lib64" ]; then
++ cp -rf /tmp/vulndb_data/db/*.json /usr/lib64/python2.7/site-packages/vulndb/db/
++else
++ cp -rf /tmp/vulndb_data/db/*.json /usr/lib/python2.7/site-packages/vulndb/db/
++fi
+
-# Push to repo
-git commit vulndb/db/ vulndb/version.txt vulndb/db-version.txt -m 'Updated vulnerability database'
-git push
\ No newline at end of file
-+cp -rf /tmp/vulndb_data/db/*.json /usr/lib64/python2.7/site-packages/vulndb/db/
++rm -r /tmp/vulndb_data