diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2021-04-09 11:05:47 -0400 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2021-04-12 12:33:59 -0400 |
| commit | 8a7ae6a3ac69a020758f7b0825a872e44714dbed (patch) | |
| tree | ad20877d0294c500662b2697bbfdccbe70f40868 | |
| parent | 1a3a47c8060ddcc121b42f5fc012c9dc79a88aa0 (diff) | |
| download | sos-8a7ae6a3ac69a020758f7b0825a872e44714dbed.tar.gz | |
[ubuntu|Policy] Fix exception when attempting upload
Fixes an issue where an upload attempt on Ubuntu systems would fail with
a traceback due to the upload archive's name not being available when we
first check to make sure we have an upload location, since the Ubuntu
default location requires an archive/file name.
Related to this, stop clobbering `upload_archive` and assign the archive
name to an `upload_archive_name` variable instead.
Closes: #2472
Resolves: #2479
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
| -rw-r--r-- | sos/policies/distros/__init__.py | 9 | ||||
| -rw-r--r-- | sos/policies/distros/ubuntu.py | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sos/policies/distros/__init__.py b/sos/policies/distros/__init__.py index 022ba7f4..a24a0e5b 100644 --- a/sos/policies/distros/__init__.py +++ b/sos/policies/distros/__init__.py @@ -149,6 +149,7 @@ class LinuxPolicy(Policy): self.upload_user = cmdline_opts.upload_user self.upload_directory = cmdline_opts.upload_directory self.upload_password = cmdline_opts.upload_pass + self.upload_archive_name = '' if not cmdline_opts.batch and not \ cmdline_opts.quiet: @@ -237,7 +238,7 @@ class LinuxPolicy(Policy): `get_upload_url_string()` Print a more human-friendly string than vendor URLs """ - self.upload_archive = archive + self.upload_archive_name = archive if not self.upload_url: self.upload_url = self.get_upload_url() if not self.upload_url: @@ -384,7 +385,7 @@ class LinuxPolicy(Policy): raise Exception("Unable to upload due to missing python requests " "library") - with open(self.upload_archive, 'rb') as arc: + with open(self.upload_archive_name, 'rb') as arc: if not self._use_https_streaming: r = self._upload_https_no_stream(arc) else: @@ -467,9 +468,9 @@ class LinuxPolicy(Policy): % str(err)) try: - with open(self.upload_archive, 'rb') as _arcfile: + with open(self.upload_archive_name, 'rb') as _arcfile: session.storbinary( - "STOR %s" % self.upload_archive.split('/')[-1], + "STOR %s" % self.upload_archive_name.split('/')[-1], _arcfile ) session.quit() diff --git a/sos/policies/distros/ubuntu.py b/sos/policies/distros/ubuntu.py index 94a4a241..308c1e35 100644 --- a/sos/policies/distros/ubuntu.py +++ b/sos/policies/distros/ubuntu.py @@ -74,7 +74,9 @@ class UbuntuPolicy(DebianPolicy): def get_upload_url(self): if not self.upload_url or self.upload_url.startswith(self._upload_url): - fname = os.path.basename(self.upload_archive) + if not self.upload_archive_name: + return self._upload_url + fname = os.path.basename(self.upload_archive_name) return self._upload_url + fname super(UbuntuPolicy, self).get_upload_url() |