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 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..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 @@ -107,6 +107,10 @@ META_OPTION= if [[ $2 == "--meta=yes" ]]; then { META_OPTION="--meta" +}; +elif [[ $2 == "--meta=attic" ]]; then +{ + META_OPTION="--keep-attic" }; fi