diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2014-02-03 14:36:46 +0000 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2014-02-03 14:36:46 +0000 |
| commit | a9bf294a6898bb1defb396c0c0bca29234855db6 (patch) | |
| tree | ff676494be7f7795543de0db81c90dca5fa7cb4a | |
| parent | 3b727c296b86172a64dae83cb02a42fe4c5c6af9 (diff) | |
| download | sos-a9bf294a6898bb1defb396c0c0bca29234855db6.tar.gz | |
Make get_cmd_output_now() behaviour match 2.2
The equivalent method in sos-2.2, collectOutputNow() returned an
absolute path to the collected file. Since the archive changes in
3.0 this now returns a path relative to the root of the archive.
This breaks existing users of the interface that try to open and
process the content of the collected file (e.g. gluster).
Return a join of the archive path and file path to the caller.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index 8df430d8..7130c7ad 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -593,7 +593,7 @@ class Plugin(object): time_passed = time() - start_time self.proflog.debug("output: %-75s time: %f" % (exe, time_passed)) - return outfn + return os.path.join(self.archive.get_archive_path(), outfn) # For adding output def add_alert(self, alertstring): |