[git-buildpackage] [PATCH] call debchange instead of dch

[Guido Günther]

On Sat, Jun 27, 2015 at 05:59:12PM +0200, Evgeni Golov wrote:
> From: Evgeni Golov <evgeni at debian.org>
> 
> Call the tool by its actual name instead of the abbriviation.
> dch is a symlink to debchange, which is not present on Fedora [1].

Applied. Thanks.
 -- Guido

> 
> [1] https://bugzilla.redhat.com/show_bug.cgi?id=1236122
> ---
>  gbp/command_wrappers.py     | 2 +-
>  gbp/deb/changelog.py        | 2 +-
>  tests/11_test_dch_main.py   | 2 +-
>  tests/test_Changelog.py     | 4 ++--
>  tests/testutils/__init__.py | 2 +-
>  5 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py
> index 8068666..d3a0c0a 100644
> --- a/gbp/command_wrappers.py
> +++ b/gbp/command_wrappers.py
> @@ -260,7 +260,7 @@ class Dch(Command):
>          args = ['-v', version]
>          if msg:
>              args.append(msg)
> -        Command.__init__(self, 'dch', args)
> +        Command.__init__(self, 'debchange', args)
>          self.run_error = "Dch failed: {err_reason}"
>  
>  
> diff --git a/gbp/deb/changelog.py b/gbp/deb/changelog.py
> index 5fe81ae..f26ac76 100644
> --- a/gbp/deb/changelog.py
> +++ b/gbp/deb/changelog.py
> @@ -261,7 +261,7 @@ class ChangeLog(object):
>              args.append('[[[insert-git-dch-commit-message-here]]]')
>          else:
>              args.append('')
> -        dch = Command('dch', args, extra_env=env)
> +        dch = Command('debchange', args, extra_env=env)
>          dch.call([])
>          if msg:
>              old_cl = open("debian/changelog", "r")
> diff --git a/tests/11_test_dch_main.py b/tests/11_test_dch_main.py
> index acea692..8f7d9bf 100644
> --- a/tests/11_test_dch_main.py
> +++ b/tests/11_test_dch_main.py
> @@ -46,7 +46,7 @@ cl_debian = """test-package (0.9-1) unstable; urgency=%s
>  """ % default_urgency
>  
>  
> - at unittest.skipIf(not os.path.exists('/usr/bin/dch'), "Dch not found")
> + at unittest.skipIf(not os.path.exists('/usr/bin/debchange'), "Dch not found")
>  class TestScriptDch(DebianGitTestRepo):
>      """Test git-dch"""
>  
> diff --git a/tests/test_Changelog.py b/tests/test_Changelog.py
> index a22731f..e66b42f 100644
> --- a/tests/test_Changelog.py
> +++ b/tests/test_Changelog.py
> @@ -47,8 +47,8 @@ cl_epoch="""xserver-xorg-video-nv (1:1.2.0-3) unstable; urgency=low
>  
>  def setup():
>      """Setup test module"""
> -    if not os.path.exists('/usr/bin/dch'):
> -        raise nose.SkipTest('dch tool not present')
> +    if not os.path.exists('/usr/bin/debchange'):
> +        raise nose.SkipTest('debchange tool not present')
>  
>  def test_parse_debian_only():
>      """
> diff --git a/tests/testutils/__init__.py b/tests/testutils/__init__.py
> index 092d377..3ead68e 100644
> --- a/tests/testutils/__init__.py
> +++ b/tests/testutils/__init__.py
> @@ -69,7 +69,7 @@ def get_dch_default_urgency():
>      tempdir = tempfile.mkdtemp()
>      tmp_dch_name = os.path.join(tempdir, 'changelog')
>      try:
> -        dch_cmd = ['dch', '--create', '--empty', '--changelog', tmp_dch_name,
> +        dch_cmd = ['debchange', '--create', '--empty', '--changelog', tmp_dch_name,
>                     '--package=foo', '--newversion=1',
>                     '--distribution=UNRELEASED']
>          ret = subprocess.Popen(dch_cmd).wait()
> -- 
> 2.1.0
>