Merge javítás

Most ki is próbáltam

update_i42_domain.py

@@ -50,7 +50,7 @@ if args.token != None:
 try:
 	LOG_FILE
 except NameError:
-	LOG_FILE = args.log_file
+	LOG_FILE = ""
 
 if args.log_file != None:
 	LOG_FILE = args.log_file
@@ -81,7 +81,7 @@ try:
 		MY_PREFIX = '.'.join(MY_PREFIX.split('.')[:-2])
 except NameError:
 	logging.error("Prefix megadása kötelező.")
-	raise
+	sys.exit()
 
 data_v6 = data_v4 = {"token" : MY_TOKEN, "prefix": MY_PREFIX}
 host = "https://updaterv%d.i42.hu:10053"