Fix make

rustprooflabs · May 24, 2024 · 75a1529 · 75a1529
1 parent c821bec
commit 75a1529
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/docker/db.py b/docker/db.py
@@ -634,7 +634,10 @@ def log_import_message(import_id, msg, schema_name):
     msg : str
     schema_name: str
     """
-    pbf_timestamp = os.environ['PBF_TIMESTAMP']
+    try:
+        pbf_timestamp = os.environ['PBF_TIMESTAMP']
+    except KeyError:
+        pbf_timestamp = os.environ['PGOSM_DATE']
     sql_raw = """
 UPDATE {schema_name}.pgosm_flex
     SET import_status = %(msg)s ,

diff --git a/docker/helpers.py b/docker/helpers.py
@@ -309,7 +309,7 @@ def okay_to_run(self, prior_import: dict) -> bool:
         # Check git version against latest.
         # If current version is lower than prior version from latest import, stop.
         prior_import_version = prior_import['pgosm_flex_version_no_hash']
-        git_tag = helpers.get_git_info(tag_only=True)
+        git_tag = get_git_info(tag_only=True)
 
         if git_tag == '-- (version unknown) --':
             msg = 'Unable to detect PgOSM Flex version from Git.'

diff --git a/docker/tests/test_osm2pgsql_recommendation.py b/docker/tests/test_osm2pgsql_recommendation.py
@@ -3,7 +3,7 @@
 import unittest
 
 import osm2pgsql_recommendation
-from import_mode import ImportMode
+from helpers import ImportMode
 
 
 class Osm2pgsqlRecommendationTests(unittest.TestCase):