[tor-commits] [torflow/master] Fix .gitignores

[mikeperry@xxxxxxxxxxxxxx]

commit 500b5525cd2d5cb953ae1ccb4b3bc66282b10c72
Author: Tom Ritter <tom@xxxxxxxxx>
Date:   Thu May 21 12:55:52 2015 -0500

    Fix .gitignores
    
    Make them actually ignore the data files that are generated, and prevent the .gitignores from being deleted by run_scan.sh
---
 NetworkScanners/BwAuthority/.gitignore               |   18 ++++++++++++++++++
 .../BwAuthority/data/scanner.1/scan-data/.gitignore  |    2 ++
 .../BwAuthority/data/scanner.2/scan-data/.gitignore  |    2 ++
 .../BwAuthority/data/scanner.3/scan-data/.gitignore  |    2 ++
 .../BwAuthority/data/scanner.4/scan-data/.gitignore  |    2 ++
 .../BwAuthority/data/scanner.5/scan-data/.gitignore  |    2 ++
 .../BwAuthority/data/scanner.6/scan-data/.gitignore  |    2 ++
 .../BwAuthority/data/scanner.7/scan-data/.gitignore  |    2 ++
 .../BwAuthority/data/scanner.8/scan-data/.gitignore  |    2 ++
 NetworkScanners/BwAuthority/run_scan.sh              |    2 +-
 10 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/NetworkScanners/BwAuthority/.gitignore b/NetworkScanners/BwAuthority/.gitignore
index a0ea384..319a96f 100644
--- a/NetworkScanners/BwAuthority/.gitignore
+++ b/NetworkScanners/BwAuthority/.gitignore
@@ -1 +1,19 @@
 local.cfg
+bwscan.V3BandwidthsFile
+
+data/bwscan*
+data/aggregate-control.log
+data/aggregate-debug.log
+
+data/tor*/cached-certs
+data/tor*/cached-consensus
+data/tor*/cached-descriptors
+data/tor*/cached-descriptors.new
+data/tor*/control_auth_cookie
+data/tor*/lock
+data/tor*/state
+data/tor*/tor.log
+data/tor*/tor.pid
+
+data/scanner.*/bw.log
+data/scanner.*/bwauthority.pid
\ No newline at end of file
diff --git a/NetworkScanners/BwAuthority/data/scanner.1/scan-data/.gitignore b/NetworkScanners/BwAuthority/data/scanner.1/scan-data/.gitignore
index e69de29..20f86df 100644
--- a/NetworkScanners/BwAuthority/data/scanner.1/scan-data/.gitignore
+++ b/NetworkScanners/BwAuthority/data/scanner.1/scan-data/.gitignore
@@ -0,0 +1,2 @@
+bws-*
+sql-*
\ No newline at end of file
diff --git a/NetworkScanners/BwAuthority/data/scanner.2/scan-data/.gitignore b/NetworkScanners/BwAuthority/data/scanner.2/scan-data/.gitignore
index e69de29..20f86df 100644
--- a/NetworkScanners/BwAuthority/data/scanner.2/scan-data/.gitignore
+++ b/NetworkScanners/BwAuthority/data/scanner.2/scan-data/.gitignore
@@ -0,0 +1,2 @@
+bws-*
+sql-*
\ No newline at end of file
diff --git a/NetworkScanners/BwAuthority/data/scanner.3/scan-data/.gitignore b/NetworkScanners/BwAuthority/data/scanner.3/scan-data/.gitignore
index e69de29..20f86df 100644
--- a/NetworkScanners/BwAuthority/data/scanner.3/scan-data/.gitignore
+++ b/NetworkScanners/BwAuthority/data/scanner.3/scan-data/.gitignore
@@ -0,0 +1,2 @@
+bws-*
+sql-*
\ No newline at end of file
diff --git a/NetworkScanners/BwAuthority/data/scanner.4/scan-data/.gitignore b/NetworkScanners/BwAuthority/data/scanner.4/scan-data/.gitignore
index e69de29..20f86df 100644
--- a/NetworkScanners/BwAuthority/data/scanner.4/scan-data/.gitignore
+++ b/NetworkScanners/BwAuthority/data/scanner.4/scan-data/.gitignore
@@ -0,0 +1,2 @@
+bws-*
+sql-*
\ No newline at end of file
diff --git a/NetworkScanners/BwAuthority/data/scanner.5/scan-data/.gitignore b/NetworkScanners/BwAuthority/data/scanner.5/scan-data/.gitignore
index e69de29..20f86df 100644
--- a/NetworkScanners/BwAuthority/data/scanner.5/scan-data/.gitignore
+++ b/NetworkScanners/BwAuthority/data/scanner.5/scan-data/.gitignore
@@ -0,0 +1,2 @@
+bws-*
+sql-*
\ No newline at end of file
diff --git a/NetworkScanners/BwAuthority/data/scanner.6/scan-data/.gitignore b/NetworkScanners/BwAuthority/data/scanner.6/scan-data/.gitignore
new file mode 100644
index 0000000..20f86df
--- /dev/null
+++ b/NetworkScanners/BwAuthority/data/scanner.6/scan-data/.gitignore
@@ -0,0 +1,2 @@
+bws-*
+sql-*
\ No newline at end of file
diff --git a/NetworkScanners/BwAuthority/data/scanner.7/scan-data/.gitignore b/NetworkScanners/BwAuthority/data/scanner.7/scan-data/.gitignore
new file mode 100644
index 0000000..20f86df
--- /dev/null
+++ b/NetworkScanners/BwAuthority/data/scanner.7/scan-data/.gitignore
@@ -0,0 +1,2 @@
+bws-*
+sql-*
\ No newline at end of file
diff --git a/NetworkScanners/BwAuthority/data/scanner.8/scan-data/.gitignore b/NetworkScanners/BwAuthority/data/scanner.8/scan-data/.gitignore
new file mode 100644
index 0000000..20f86df
--- /dev/null
+++ b/NetworkScanners/BwAuthority/data/scanner.8/scan-data/.gitignore
@@ -0,0 +1,2 @@
+bws-*
+sql-*
\ No newline at end of file
diff --git a/NetworkScanners/BwAuthority/run_scan.sh b/NetworkScanners/BwAuthority/run_scan.sh
index d2674ec..8a71b1d 100755
--- a/NetworkScanners/BwAuthority/run_scan.sh
+++ b/NetworkScanners/BwAuthority/run_scan.sh
@@ -33,7 +33,7 @@ sleep 5
 
 # FIXME: We resume in a ghetto way by saving the bws-*done* files.
 # A more accurate resume could be implemented in bwauthority.py
-find data/scanner.* -name .svn -prune -o -type f -a ! -name '*-done-*' -a ! -name bwauthority.cfg -exec rm {} +
+find data/scanner.* -name .svn -prune -o -type f -a ! -name '*-done-*' -a ! -name bwauthority.cfg -a ! -name .gitignore -exec rm {} +
 
 rm -f ./data/tor/tor.log
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits