Attachment 157202 Details for Bug 244369 – Here's the patch to detect vimdiff

[patch] Here's the patch to detect vimdiff

merge-conf-vimdiff.patch (text/plain), 1.99 KB, created by Aurelien Bompard on 2007-06-16 19:21:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelien Bompard

Created: 2007-06-16 19:21:11 UTC

Size: 1.99 KB

patch

obsolete

>--- /usr/lib/yum-plugins/merge-conf.py	2007-05-16 10:03:43.000000000 +0200
>+++ merge-conf.py	2007-06-16 21:10:06.000000000 +0200
>@@ -34,6 +34,11 @@
>                       help='Merge configuration changes after installation')
> 
> def posttrans_hook(conduit):
>+    has_vimdiff = False
>+    for d in os.getenv("PATH", "").split(":"):
>+        if os.path.exists(os.path.join(d, "vimdiff")):
>+            has_vimdiff = True
>+            break
>     ts = conduit.getTsInfo()
>     for tsmem in ts.getMembers():
>         rpmdb = conduit.getRpmDB()
>@@ -57,11 +62,11 @@
>             for file, mode, flags in filetuple:
>                 if flags & RPMFILE_CONFIG:
>                     if flags & RPMFILE_NOREPLACE:
>-                        mergeConfFiles(tsmem.po.name, file, True, conduit)
>+                        mergeConfFiles(tsmem.po.name, file, True, conduit, has_vimdiff)
>                     else:
>-                        mergeConfFiles(tsmem.po.name, file, False, conduit)
>+                        mergeConfFiles(tsmem.po.name, file, False, conduit, has_vimdiff)
> 
>-def mergeConfFiles(pkg, file, noreplace, conduit):
>+def mergeConfFiles(pkg, file, noreplace, conduit, has_vimdiff):
>     if noreplace:
>         local_file = file
>         pkg_file = "%s.rpmnew" % file
>@@ -98,7 +103,8 @@
>             print " - install the package's version (i)"
>         else:
>             print " - keep your version (n)"
>-        print " - merge interactively with vim (v)"
>+        if has_vimdiff:
>+            print " - merge interactively with vim (v)"
>         print " - background this process and examine manually (z)"
>         sys.stdout.write("Your answer ? ")
>         answer = sys.stdin.readline().strip()
>@@ -124,7 +130,7 @@
>             os.system(os.getenv("SHELL", "bash"))
>         elif answer == "q":
>             print "Choosing RPM's default action."
>-        elif answer == "v":
>+        elif answer == "v" and has_vimdiff:
>             os.system("""vimdiff '%s' '%s'""" % (final_file, other_file))
>             break
>         else:

Actions: View | Diff

Attachments on bug 244369: 157202