From 23ff39b327ae2adb4d13a91e112b5e5c3ec9ecff Mon Sep 17 00:00:00 2001 From: ChrissW-R1 Date: Tue, 11 Apr 2017 10:11:05 +0200 Subject: [PATCH 1/4] added IntelliJ specific project files to ignore lists --- .cvsignore | 2 ++ .gitignore | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.cvsignore b/.cvsignore index 35bc67389..5490c25c8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -18,3 +18,5 @@ osmy_vigilance init_database.sql init_derived_data.sql +/.idea/ +/*.iml diff --git a/.gitignore b/.gitignore index 2e429f538..40f82fb80 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /cgi-bin/ /test-bin/ +/.idea/ +*.iml \ No newline at end of file From 594e6ed7b6511de63d98bd732194218e5fba5834 Mon Sep 17 00:00:00 2001 From: ChrissW-R1 Date: Tue, 11 Apr 2017 10:11:05 +0200 Subject: [PATCH 2/4] added IntelliJ specific project files to ignore lists --- .cvsignore | 2 ++ .gitignore | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.cvsignore b/.cvsignore index 35bc67389..9107ef083 100644 --- a/.cvsignore +++ b/.cvsignore @@ -18,3 +18,5 @@ osmy_vigilance init_database.sql init_derived_data.sql +/.idea/ +*.iml diff --git a/.gitignore b/.gitignore index 2e429f538..40f82fb80 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /cgi-bin/ /test-bin/ +/.idea/ +*.iml \ No newline at end of file From 321d40efd9186f5bd53313dc30508c0dd216c308 Mon Sep 17 00:00:00 2001 From: ChrissW-R1 Date: Tue, 11 Apr 2017 10:46:15 +0200 Subject: [PATCH 3/4] added attic parameter to combined fetch and apply script --- src/bin/apply_osc_to_db.sh | 2 +- src/bin/fetch_osc_and_apply.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bin/apply_osc_to_db.sh b/src/bin/apply_osc_to_db.sh index a9743ee66..62e959896 100644 --- a/src/bin/apply_osc_to_db.sh +++ b/src/bin/apply_osc_to_db.sh @@ -48,7 +48,7 @@ elif [[ $3 == "--meta=no" ]]; then META= else { - echo "You must specify --meta=yes or --meta=no" + echo "You have to specify --meta=yes, --meta=no or --meta=attic" exit 0 }; fi diff --git a/src/bin/fetch_osc_and_apply.sh b/src/bin/fetch_osc_and_apply.sh index 7f57f138f..434843823 100644 --- a/src/bin/fetch_osc_and_apply.sh +++ b/src/bin/fetch_osc_and_apply.sh @@ -107,6 +107,10 @@ META_OPTION= if [[ $2 == "--meta=yes" ]]; then { META_OPTION="--meta" +}; +elif [[ $2 == "--meta=attic" ]]; then +{ + META_OPTION="--keep-attic" }; fi From 249c4f6cbc4ded9419002fa64824a202c71837f8 Mon Sep 17 00:00:00 2001 From: ChrissW-R1 Date: Tue, 11 Apr 2017 17:08:41 +0200 Subject: [PATCH 4/4] added information about attic support to error message --- src/bin/fetch_osc_and_apply.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/fetch_osc_and_apply.sh b/src/bin/fetch_osc_and_apply.sh index 434843823..989ab3765 100644 --- a/src/bin/fetch_osc_and_apply.sh +++ b/src/bin/fetch_osc_and_apply.sh @@ -19,8 +19,8 @@ if [[ -z $1 ]]; then { - echo "Usage: $0 diff_url --meta=(yes|no)" - echo "Error : Set the URL to get diffs from (like http://planet.osm.org/replication/minute )" + echo "Usage: $0 diff_url --meta=(yes|no|attic)" + echo "Error : Set the URL to get diffs from (e.g. http://planet.osm.org/replication/minute )" exit 0 }; fi