koji

Clone

#3438 CLI: More details when files conflict in download-task
Merged 2 years ago by tkopecek. Opened 2 years ago by jcupova.
jcupova/koji issue-3433  into  master

file modified
+9 
@@ -7015,6 +7015,15 @@ 
 

      if not suboptions.dirpertask:
 

          not_uniques = list({x for x in downloads_new_names if downloads_new_names.count(x) > 1})
 

          if not_uniques:
 

+             files_dict = {}
 

+             for nu in not_uniques:
 

+                 for (_, _, vol, new_filename, task_id) in downloads:
 

+                     if new_filename == nu[0] and vol == nu[1]:
 

+                         files_dict.setdefault(new_filename, {'vol': vol, 'tasks': []})
 

+                         files_dict[new_filename]['tasks'].append(task_id)
 

+             for key, value in files_dict.items():
 

+                 warn('Duplicate file %s for volume %s (tasks [%s])' % (key, value['vol'],
 

+                                                                        ", ".join(value['tasks'])))
 

              error("Download files names conflict, use --dirpertask")
 

  

      # perform the download

file modified
+2 -1 
@@ -702,7 +702,8 @@ 
 

          self.assert_system_exit(
 

              anon_handle_download_task,
 

              self.options, self.session, args,
 

-             stderr="Download files names conflict, use --dirpertask\n",
 

+             stderr="Duplicate file somerpm.noarch.rpm for volume DEFAULT (tasks [22222, 55555])\n"
 

+                    "Download files names conflict, use --dirpertask\n",
 

              stdout='',
 

              activate_session=None,
 

              exit_code=1)

Could be replaced by

files_dict.setdefault(new_filename, {'vol': vol, 'tasks': []})

Does volume play any role here?

rebased onto d54595e69e2c82970a24053d385ccf3a0bd00b59
2 years ago

@tkopecek updated

Yes, volume is used for conflicts. When files are on different volumes, it is not conflict here.

rebased onto 3220831
2 years ago

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready
2 years ago

pretty please pagure-ci rebuild
2 years ago

Metadata Update from @jobrauer:
- Pull-request tagged with: testing-done
2 years ago

Commit 10cf87b fixes this pull-request

Pull-Request has been merged by tkopecek
2 years ago
Metadata
None

testing-ready testing-done

Changes Summary 2
+9 -0
file changed
cli/koji_cli/commands.py
+2 -1
file changed
tests/test_cli/test_download_task.py
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.