fix bug in directory names
This commit is contained in:
parent
8f971496cd
commit
1f4fedb432
|
@ -47,12 +47,12 @@ __email__ = 'n0mjs@me.com'
|
|||
|
||||
|
||||
try:
|
||||
from DMRlink.ipsc_const import *
|
||||
from ipsc.ipsc_const import *
|
||||
except ImportError:
|
||||
sys.exit('IPSC constants file not found or invalid')
|
||||
|
||||
try:
|
||||
from DMRlink.ipsc_mask import *
|
||||
from ipsc.ipsc_mask import *
|
||||
except ImportError:
|
||||
sys.exit('IPSC mask values file not found or invalid')
|
||||
|
||||
|
@ -626,8 +626,8 @@ if __name__ == '__main__':
|
|||
import os
|
||||
import signal
|
||||
|
||||
from DMRlink.dmrlink_config import build_config
|
||||
from DMRlink.dmrlink_log import config_logging
|
||||
from ipsc.dmrlink_config import build_config
|
||||
from ipsc.dmrlink_log import config_logging
|
||||
|
||||
# Change the current directory to the location of the application
|
||||
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
|
||||
|
|
|
@ -55,7 +55,7 @@ import sys
|
|||
from dmr_utils.utils import hex_str_3, hex_str_4, int_id
|
||||
|
||||
from dmrlink import IPSC, mk_ipsc_systems, systems, reportFactory, REPORT_OPCODES, build_aliases, config_reports
|
||||
from DMRlink.ipsc_const import BURST_DATA_TYPE
|
||||
from ipsc.ipsc_const import BURST_DATA_TYPE
|
||||
|
||||
|
||||
__author__ = 'Cortney T. Buffington, N0MJS'
|
||||
|
@ -445,8 +445,8 @@ if __name__ == '__main__':
|
|||
import os
|
||||
import signal
|
||||
|
||||
from DMRlink.dmrlink_config import build_config
|
||||
from DMRlink.dmrlink_log import config_logging
|
||||
from ipsc.dmrlink_config import build_config
|
||||
from ipsc.dmrlink_log import config_logging
|
||||
|
||||
# Change the current directory to the location of the application
|
||||
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
|
||||
|
|
|
@ -59,7 +59,7 @@ import cPickle as pickle
|
|||
from dmr_utils.utils import hex_str_3, hex_str_4, int_id
|
||||
|
||||
from dmrlink import IPSC, mk_ipsc_systems, systems, reportFactory, REPORT_OPCODES, build_aliases
|
||||
from DMRlink.ipsc_const import BURST_DATA_TYPE
|
||||
from ipsc.ipsc_const import BURST_DATA_TYPE
|
||||
|
||||
|
||||
__author__ = 'Cortney T. Buffington, N0MJS'
|
||||
|
@ -433,8 +433,8 @@ if __name__ == '__main__':
|
|||
import os
|
||||
import signal
|
||||
|
||||
from DMRlink.dmrlink_config import build_config
|
||||
from DMRlink.dmrlink_log import config_logging
|
||||
from ipsc.dmrlink_config import build_config
|
||||
from ipsc.dmrlink_log import config_logging
|
||||
|
||||
# Change the current directory to the location of the application
|
||||
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
|
||||
|
|
10
dmrlink.py
10
dmrlink.py
|
@ -44,9 +44,9 @@ from twisted.protocols.basic import NetstringReceiver
|
|||
from twisted.internet import reactor, task
|
||||
|
||||
# Imports files in the dmrlink subdirectory (these things shouldn't change often)
|
||||
from DMRlink.ipsc_const import *
|
||||
from DMRlink.ipsc_mask import *
|
||||
from DMRlink.reporting_const import *
|
||||
from ipsc.ipsc_const import *
|
||||
from ipsc.ipsc_mask import *
|
||||
from ipsc.reporting_const import *
|
||||
|
||||
# Imports from DMR Utilities package
|
||||
from dmr_utils.utils import hex_str_2, hex_str_3, hex_str_4, int_id, try_download, mk_id_dict
|
||||
|
@ -1052,8 +1052,8 @@ if __name__ == '__main__':
|
|||
import os
|
||||
import signal
|
||||
|
||||
from DMRlink.dmrlink_config import build_config
|
||||
from DMRlink.dmrlink_log import config_logging
|
||||
from ipsc.dmrlink_config import build_config
|
||||
from ipsc.dmrlink_log import config_logging
|
||||
|
||||
# Change the current directory to the location of the application
|
||||
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
|
||||
|
|
4
log.py
4
log.py
|
@ -95,8 +95,8 @@ if __name__ == '__main__':
|
|||
import os
|
||||
import signal
|
||||
|
||||
from DMRlink.dmrlink_config import build_config
|
||||
from DMRlink.dmrlink_log import config_logging
|
||||
from ipsc.dmrlink_config import build_config
|
||||
from ipsc.dmrlink_log import config_logging
|
||||
|
||||
# Change the current directory to the location of the application
|
||||
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
|
||||
|
|
|
@ -39,7 +39,7 @@ import cPickle as pickle
|
|||
from dmrlink import IPSC, mk_ipsc_systems, systems, reportFactory, build_aliases, config_reports
|
||||
|
||||
from dmr_utils.utils import int_id, hex_str_3
|
||||
from DMRlink.ipsc_const import BURST_DATA_TYPE
|
||||
from ipsc.ipsc_const import BURST_DATA_TYPE
|
||||
|
||||
__author__ = 'Cortney T. Buffington, N0MJS'
|
||||
__copyright__ = 'Copyright (c) 2014 - 2015 Cortney T. Buffington, N0MJS and the K0USY Group'
|
||||
|
@ -138,8 +138,8 @@ if __name__ == '__main__':
|
|||
import os
|
||||
import signal
|
||||
|
||||
from DMRlink.dmrlink_config import build_config
|
||||
from DMRlink.dmrlink_log import config_logging
|
||||
from ipsc.dmrlink_config import build_config
|
||||
from ipsc.dmrlink_log import config_logging
|
||||
|
||||
# Change the current directory to the location of the application
|
||||
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
|
||||
|
|
|
@ -119,8 +119,8 @@ if __name__ == '__main__':
|
|||
import os
|
||||
import signal
|
||||
|
||||
from DMRlink.dmrlink_config import build_config
|
||||
from DMRlink.dmrlink_log import config_logging
|
||||
from ipsc.dmrlink_config import build_config
|
||||
from ipsc.dmrlink_log import config_logging
|
||||
|
||||
# Change the current directory to the location of the application
|
||||
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
|
||||
|
|
6
rcm.py
6
rcm.py
|
@ -34,7 +34,7 @@ import dmrlink
|
|||
import sys
|
||||
from dmrlink import IPSC, mk_ipsc_systems, systems, reportFactory, build_aliases, config_reports
|
||||
from dmr_utils.utils import get_alias, int_id
|
||||
from DMRlink.ipsc_const import *
|
||||
from ipsc.ipsc_const import *
|
||||
|
||||
__author__ = 'Cortney T. Buffington, N0MJS'
|
||||
__copyright__ = 'Copyright (c) 2013, 2014 Cortney T. Buffington, N0MJS and the K0USY Group'
|
||||
|
@ -149,8 +149,8 @@ if __name__ == '__main__':
|
|||
import os
|
||||
import signal
|
||||
|
||||
from DMRlink.dmrlink_config import build_config
|
||||
from DMRlink.dmrlink_log import config_logging
|
||||
from ipsc.dmrlink_config import build_config
|
||||
from ipsc.dmrlink_log import config_logging
|
||||
|
||||
# Change the current directory to the location of the application
|
||||
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
|
||||
|
|
|
@ -46,7 +46,7 @@ import pymysql
|
|||
import dmrlink
|
||||
from dmrlink import IPSC, mk_ipsc_systems, systems, reportFactory, build_aliases, config_reports
|
||||
|
||||
from DMRlink.ipsc_const import *
|
||||
from ipsc.ipsc_const import *
|
||||
|
||||
__author__ = 'Cortney T. Buffington, N0MJS'
|
||||
__copyright__ = 'Copyright (c) 2013, 2014 Cortney T. Buffington, N0MJS and the K0USY Group'
|
||||
|
@ -113,8 +113,8 @@ if __name__ == '__main__':
|
|||
import os
|
||||
import signal
|
||||
|
||||
from DMRlink.dmrlink_config import build_config
|
||||
from DMRlink.dmrlink_log import config_logging
|
||||
from ipsc.dmrlink_config import build_config
|
||||
from ipsc.dmrlink_log import config_logging
|
||||
|
||||
# Change the current directory to the location of the application
|
||||
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
|
||||
|
|
|
@ -110,8 +110,8 @@ if __name__ == '__main__':
|
|||
import os
|
||||
import signal
|
||||
|
||||
from DMRlink.dmrlink_config import build_config
|
||||
from DMRlink.dmrlink_log import config_logging
|
||||
from ipsc.dmrlink_config import build_config
|
||||
from ipsc.dmrlink_log import config_logging
|
||||
|
||||
# Change the current directory to the location of the application
|
||||
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
|
||||
|
|
Loading…
Reference in New Issue