fixing upload remote (#7784)

conan-io · Oct 1, 2020 · c09563b · c09563b
1 parent 8a6f827
commit c09563b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/conans/client/cmd/uploader.py b/conans/client/cmd/uploader.py
@@ -217,7 +217,7 @@ def upload_ref(ref_conanfile_prefs):
                                      integrity_check, policy, remote, upload_recorder, remotes)
                 except BaseException as base_exception:
                     base_trace = traceback.format_exc()
-                    self._exceptions_list.append((base_exception, _ref, base_trace))
+                    self._exceptions_list.append((base_exception, _ref, base_trace, remote))
 
             self._upload_thread_pool.map(upload_ref,
                                          [(ref, conanfile, prefs) for (ref, conanfile, prefs) in
@@ -227,7 +227,7 @@ def upload_ref(ref_conanfile_prefs):
         self._upload_thread_pool.join()
 
         if len(self._exceptions_list) > 0:
-            for exc, ref, trace in self._exceptions_list:
+            for exc, ref, trace, remote in self._exceptions_list:
                 t = "recipe" if isinstance(ref, ConanFileReference) else "package"
                 msg = "%s: Upload %s to '%s' failed: %s\n" % (str(ref), t, remote.name, str(exc))
                 if get_env("CONAN_VERBOSE_TRACEBACK", False):
@@ -268,7 +268,7 @@ def upload_package_index(index_pref):
                     upload_recorder.add_package(pref, p_remote.name, p_remote.url)
                 except BaseException as pkg_exc:
                     trace = traceback.format_exc()
-                    return pkg_exc, pref, trace
+                    return pkg_exc, pref, trace, p_remote
 
             def upload_package_callback(ret):
                 package_exceptions = [r for r in ret if r is not None]

diff --git a/conans/test/functional/remote/multi_remote_checks_test.py b/conans/test/functional/remote/multi_remote_checks_test.py
@@ -3,6 +3,7 @@
 
 import time
 
+from conans.test.utils.genconanfile import GenConanfile
 from conans.test.utils.tools import NO_SETTINGS_PACKAGE_ID, TestClient, TestServer, \
     inc_package_manifest_timestamp, inc_recipe_manifest_timestamp
 from conans.util.env_reader import get_env
@@ -84,16 +85,15 @@ def test_multiple_remotes_single_upload(self):
                                ("server2", TestServer())])
         client = TestClient(servers=servers, users={"server1": [("lasote", "mypass")],
                                                     "server2": [("lasote", "mypass")]})
-        conanfile = """from conans import ConanFile
-class Pkg(ConanFile):
-    settings = "build_type"
-    """
+        conanfile = GenConanfile().with_setting("build_type")
         client.save({"conanfile.py": conanfile})
         client.run("create . Pkg/0.1@lasote/testing -s build_type=Release")
         client.run("create . Pkg2/0.1@lasote/testing -s build_type=Release")
         client.run("remote add_ref Pkg/0.1@lasote/testing server1")
         client.run("remote add_ref Pkg2/0.1@lasote/testing server2")
         client.run("upload Pkg* --all --confirm")
+        self.assertIn("Uploaded conan recipe 'Pkg/0.1@lasote/testing' to 'server1'", client.out)
+        self.assertIn("Uploaded conan recipe 'Pkg2/0.1@lasote/testing' to 'server2'", client.out)
 
     def test_binary_packages_mixed(self):
         servers = OrderedDict([("server1", TestServer()),