Minor cleanup to simplify diff

conan/cli/commands/upload.py

@@ -6,7 +6,6 @@
 from conan.cli import make_abs_path
 from conan.cli.command import conan_command, OnceArgument
 from conan.cli.commands.list import print_list_json, print_serial
-from conans.client.downloaders.download_cache import DownloadCache
 from conans.client.userio import UserInput
 from conan.errors import ConanException
 

conans/client/cmd/uploader.py

@@ -253,10 +253,10 @@ def _local_cache_file(self, pref, cache_file, remote):
         if cache_file not in approved_files:
             return
         _download_cache = self._app.global_conf.get("core.download:download_cache")
-        if True or _download_cache and os.path.isabs(_download_cache):
+        if _download_cache and os.path.isabs(_download_cache):
             url = self._app.remote_manager._auth_manager._get_rest_client(remote)._get_api().router.package_file(pref, cache_file)
             cached_path = DownloadCache(_download_cache).cached_path(url)
-            self._output.info(f"Caching future {url} to local cache '{cached_path}'")
+            self._output.info(f"Caching {cache_file} to local cache '{cached_path}' - was uploaded to {url}")
 
 
 def compress_files(files, name, dest_dir, compresslevel=None, ref=None):

conans/test/integration/command/upload/upload_test.py

@@ -238,6 +238,8 @@ def test_upload_unmodified_package(self):
         client.run("create . --user=frodo --channel=stable")
         client.run("upload hello0/1.2.1@frodo/stable -r default")
 
+        assert "Caching conan_package.tgz to local cache" in client.out
+
         client2 = TestClient(servers=client.servers, inputs=["admin", "password"])
         client2.save({"conanfile.py": conanfile,
                       "hello.cpp": ""})