mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-31 09:43:54 +02:00
Merge remote-tracking branch 'origin/za/additional-data-transferred-domains' into za/additional-data-transferred-domains
This commit is contained in:
commit
6f918f4871
3 changed files with 6 additions and 5 deletions
|
@ -144,9 +144,10 @@ class Command(BaseCommand):
|
|||
logger.info("Reading contacts data file %s", contacts_filename)
|
||||
with open(contacts_filename, "r") as contacts_file:
|
||||
for row in csv.reader(contacts_file, delimiter=sep):
|
||||
user_id = row[0]
|
||||
user_email = row[6]
|
||||
user_emails_dictionary[user_id] = user_email
|
||||
if row != []:
|
||||
user_id = row[0]
|
||||
user_email = row[6]
|
||||
user_emails_dictionary[user_id] = user_email
|
||||
logger.info("Loaded emails for %d users", len(user_emails_dictionary))
|
||||
return user_emails_dictionary
|
||||
|
||||
|
|
|
@ -672,7 +672,7 @@ class Command(BaseCommand):
|
|||
existing_domain_info = DomainInformation.objects.filter(domain__name=target_domain_information.domain.name).exists()
|
||||
if existing_domain_information_in_to_create is not None or existing_domain_info:
|
||||
debug_string = f"""{TerminalColors.YELLOW}
|
||||
Duplicate Detected: {domain_information_to_create}.
|
||||
Duplicate Detected: {existing_domain_information_in_to_create}.
|
||||
Cannot add duplicate Domain Information object
|
||||
{TerminalColors.ENDC}"""
|
||||
else:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue