[meld] Use short version of patch flags for compatibility (closes bgo#632297)



commit c6b88b57a6d28938ae803b6576e0a47d77acd045
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Oct 18 19:48:01 2010 +1000

    Use short version of patch flags for compatibility (closes bgo#632297)
    
    Apparently some versions of the patch tool don't accept the GNU patch
    long-form options. This uses the equivalent short-form options instead.
    
    Patch from Thomas Klausner.

 meld/vc/_vc.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 1d1f697..4cd5560 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -108,7 +108,7 @@ class Vc(object):
     def resolved_command(self):
         raise NotImplementedError()
     def patch_command(self, workdir):
-        return ["patch","--strip=%i"%self.PATCH_STRIP_NUM,"--reverse","--directory=%s" % workdir]
+        return ["patch", "-p%i" % self.PATCH_STRIP_NUM, "-R", "-d", workdir]
 
     def check_repo_root(self, location):
         if not os.path.isdir(os.path.join(location, self.VC_DIR)):



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