[meld] meldapp: Fix incorrect relative path with --output (bgo#749191)



commit 388f2a86afef6eaaa94327503e75d5a4b57dd6e7
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun May 31 06:31:01 2015 +1000

    meldapp: Fix incorrect relative path with --output (bgo#749191)

 meld/meldapp.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 198b77c..153783a 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -336,7 +336,8 @@ class MeldApp(Gtk.Application):
                     tab.set_labels(options.label)
 
                 if options.outfile and isinstance(tab, filediff.FileDiff):
-                    tab.set_merge_output_file(options.outfile)
+                    outfile = make_file_from_command_line(options.outfile)
+                    tab.set_merge_output_file(outfile.get_path())
 
         if error:
             log.debug("Couldn't open comparison: %s", error)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]