@@ -501,17 +501,8 @@ def execute_osm2pgsql(context, output):
501501 context .import_file = None
502502 data_stdin = None
503503
504- env = {}
505- if context .user_args .lua_path :
506- env ['LUA_PATH' ] = context .user_args .lua_path
507- if context .user_args .themepark_path :
508- env ['THEMEPARK_PATH' ] = context .user_args .themepark_path
509- for k in ['PGPORT' , 'PGPASSWORD' , 'PGUSER' , 'PGHOST' ]:
510- if k in os .environ :
511- env [k ] = os .environ [k ]
512-
513504 proc = Popen (cmdline , cwd = str (context .workdir ),
514- stdin = PIPE , stdout = PIPE , stderr = PIPE , env = env )
505+ stdin = PIPE , stdout = PIPE , stderr = PIPE )
515506
516507 outdata = proc .communicate (input = data_stdin )
517508 context .osm2pgsql_cmdline = ' ' .join (cmdline )
@@ -794,10 +785,6 @@ def get_parser():
794785 help = '(optional) directory to search for test data' )
795786 parser .add_argument ('--style-data-dir' , type = Path ,
796787 help = '(optional) directory to search for style files' )
797- parser .add_argument ('--lua-path' ,
798- help = 'Additional paths to take into account for finding lua modules' )
799- parser .add_argument ('--themepark-path' ,
800- help = 'Additional paths to take into account for finding themepark themes' )
801788 parser .add_argument ('--test-db' , default = 'osm2pgsql-test' ,
802789 help = 'Name of database to use for testing (default: osm2pgsql-test)' )
803790 parser .add_argument ('--template-test-db' , default = 'osm2pgsql-test-template' ,
0 commit comments