[meld: 1/2] uninstalled: allow starting with any current directory



commit 41dc588ab94fff17dfdeb2606de016dd54992bb4
Author: Vasily Galkin <galkin-vv ya ru>
Date:   Fri Jan 10 20:29:08 2020 +0300

    uninstalled: allow starting with any current directory
    
    This allow running meld not only as bin/meld,
    but also as ./meld when bin is current directory or as
    /path/to/checkout/bin/meld with any current directory

 bin/meld | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/bin/meld b/bin/meld
index 2e60a46d..452d2c20 100755
--- a/bin/meld
+++ b/bin/meld
@@ -85,7 +85,7 @@ if uninstalled:
     import importlib.util
 
     loader = importlib.machinery.SourceFileLoader(
-        'meld.conf', './meld/conf.py.in')
+        'meld.conf', os.path.join(melddir, 'meld/conf.py.in'))
     spec = importlib.util.spec_from_loader(loader.name, loader)
     mod = importlib.util.module_from_spec(spec)
     loader.exec_module(mod)


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