Merge lp:~umang/python-distutils-extra/587538-no-changelog into lp:python-distutils-extra

[Umang Varma]

Fixed lp:587538 (on distutils-extra) by adding a --no-changelog flag.

Note: I've got rid of the big lists of arguments being sent to dch. Instead, I've made a list called `command` and added arguments to it as and when required.

(Things would have become messy with many if statements each using a slightly different dch command)

=== modified file 'debian/local/python-mkdebian'
--- debian/local/python-mkdebian	2010-07-23 13:48:20 +0000
+++ debian/local/python-mkdebian	2010-07-26 08:57:44 +0000
@@ -45,7 +45,7 @@
     finally:
         shutil.rmtree(instdir)
 
-def make_debian(egg, force_control, changelog, additional_dependencies, distribution):
+def make_debian(egg, force_control, changelog, additional_dependencies, distribution, use_old_changelog):
     '''Create/update debian/* from information in egg dictionary'''
 
     if not os.path.isdir('debian'):
@@ -73,7 +73,7 @@
         make_copyright(egg)
 
     make_control(egg, force_control, additional_dependencies)
-    make_changelog(egg, changelog, distribution)
+    make_changelog(egg, changelog, distribution, use_old_changelog)
 
 def make_copyright(egg):
     author = egg.get('Author', '')
@@ -196,7 +196,8 @@
             raise
         os.rename('debian/control.new', 'debian/control')
 
-def make_changelog(egg, changelog, distribution):
+def make_changelog(egg, changelog, distribution, use_old_changelog):
+    command = ['debchange']
     if not distribution:
         lsb_release = subprocess.Popen(['lsb_release', '-si'],
                 stdout=subprocess.PIPE)
@@ -212,6 +213,10 @@
             assert lsb_release.returncode == 0
     else:
         release = distribution
+        # Use --force-distribution only if distribution specified by user
+        command.append('--force-distribution')
+
+    command.append('-D' + release)
 
     if not os.path.exists('/usr/bin/debchange'):
         print >> sys.stderr, 'ERROR: Could not find "debchange".\n' \
@@ -222,18 +227,21 @@
         if not changelog:
             changelog = ['Initial release.']
         try:
-            assert subprocess.call(['debchange', '--create', '--package', egg['Name'],
-                '-D' + release, '-v' + egg['Version'], changelog[0], '--force-distribution']) == 0
+            command.extend(['--create', '--package', egg['Name'], 
+                '-v' + egg['Version'], changelog[0]])
+            assert subprocess.call(command) == 0
         except OSError, e:
             print >> sys.stderr, 'ERROR: Could not run "debchange": %s\n' \
                 'You need to install the "devscripts" package for this.' % str(e)
             sys.exit(0)
     else:
         if not changelog:
-                changelog = ['New release.']
-        # this will just fail if we already have that version, which is okay.
-        subprocess.call(['debchange', '-D' + release, '-v' + egg['Version'],
-            changelog[0], '--force-distribution'], stderr=subprocess.PIPE)
+                changelog = use_old_changelog and [''] or ['New release.']
+        if not use_old_changelog:
+            command.append('-v' + egg['Version'])
+        command.append(changelog[0])
+
+        subprocess.call(command, stderr=subprocess.PIPE)
     for message in changelog[1:]:
         subprocess.call(['debchange', message])
 
@@ -302,7 +310,9 @@
                   help='Add additional debian package dependency (can be specified multiple times)')
 parser.add_option('-D', '--distribution', dest='distribution', action='store',
                   help='Specify which Debian/Ubuntu distribution should be used in the changelog')
-parser.set_defaults(changelog=None, dependencies=[], distribution=None)
+parser.add_option('', '--no-changelog', dest='use_old_changelog', action='store_true',
+                  help='Don\'t create a new changelog entry')
+parser.set_defaults(changelog=None, dependencies=[], distribution=None, use_old_changelog=False)
 options, args = parser.parse_args()
 
 # switch stdout to line buffering, for scripts reading our output on the fly
@@ -312,4 +322,5 @@
 make_debian(egg, force_control=options.force_control,
                  changelog=options.changelog,
                  additional_dependencies=options.dependencies,
-                 distribution=options.distribution)
+                 distribution=options.distribution,
+                 use_old_changelog = options.use_old_changelog)