# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1273078459 -7200
# Node ID 4a033d7f1d93a097361a07e882a9139c44d00820
# Parent  23758c00d3abbf1d908fd5d5cde446dc03927aaf# Parent  95f2384b449556e4dac57f8323fe4b5949f5322b
backport oldstable

diff -r 23758c00d3ab -r 4a033d7f1d93 migration.py
--- a/migration.py	Wed May 05 18:15:25 2010 +0200
+++ b/migration.py	Wed May 05 18:54:19 2010 +0200
@@ -379,7 +379,7 @@
                 if optdict.get('default') is REQUIRED:
                     self.config.input_option(optdescr[1], optdict)
         self.config.generate_config(open(newconfig, 'w'))
-        show_diffs(configfile, newconfig)
+        show_diffs(configfile, newconfig, ask_confirm=self.confirm is not yes)
         os.close(fd)
         if exists(newconfig):
             os.unlink(newconfig)