[yum-git] 3 commits - plugins/merge-conf

[Seth Vidal]

 plugins/merge-conf/merge-conf.py |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit d3b0ce81df19ddc98b2bc948d0d9a818a8127dc7
Merge: 8ea8cc0... 62d2461...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Mar 13 10:20:15 2008 -0400

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum-utils
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum-utils:
      The pinKernels functionality fails pretty badly if it can't match your
      make yumdownloader wine\* download all packages starting with wine (rhbz #435096)
      make yumdownloader return an non zero value if there is notthing to download (rhbz #170287)
      Fix man page bug, from RHEL testing
      Add yum compatible arg.
      Move debugging message to level 4

commit 8ea8cc0fd945347ebf1f4e1d896c3b293c5491ae
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Mar 13 10:11:53 2008 -0400

    slight edit to make it clearer what we're doing for bug 329261

diff --git a/plugins/merge-conf/merge-conf.py b/plugins/merge-conf/merge-conf.py
index 464b6ef..e9ef8f2 100644
--- a/plugins/merge-conf/merge-conf.py
+++ b/plugins/merge-conf/merge-conf.py
@@ -39,8 +39,10 @@ def posttrans_hook(conduit):
     opts, args = conduit.getCmdLine()
     # if we're not invoked or if assumeyes is set then don't run 
     conf = conduit.getConf()
-    if not opts.merge_conf or conf.assumeyes:
+    if not opts.merge_conf:
         return
+    if conf.assumeyes:
+        return    
         
     has_vimdiff = False
     for d in os.getenv("PATH", "").split(":"):
commit 87d769cb06ac42df9982945d74c7a16f31df868a
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Mar 13 10:10:28 2008 -0400

    - make sure the user invokved merge-conf on the cli
    - only run if conf.assumeyes is not set
    
    fixes rh bug 329261

diff --git a/plugins/merge-conf/merge-conf.py b/plugins/merge-conf/merge-conf.py
index f89acfa..464b6ef 100644
--- a/plugins/merge-conf/merge-conf.py
+++ b/plugins/merge-conf/merge-conf.py
@@ -31,9 +31,17 @@ def config_hook(conduit):
     parser = conduit.getOptParser()
     if parser:
         parser.add_option('--merge-conf', action='store_true', 
-                      help='Merge configuration changes after installation')
+                   dest="merge_conf", default=False,                         
+                   help='Merge configuration changes after installation')
 
 def posttrans_hook(conduit):
+
+    opts, args = conduit.getCmdLine()
+    # if we're not invoked or if assumeyes is set then don't run 
+    conf = conduit.getConf()
+    if not opts.merge_conf or conf.assumeyes:
+        return
+        
     has_vimdiff = False
     for d in os.getenv("PATH", "").split(":"):
         if os.path.exists(os.path.join(d, "vimdiff")):