diff options
| author | Guido Günther <agx@sigxcpu.org> | 2016-10-19 13:47:50 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2016-10-19 13:47:50 +0200 |
| commit | a35d7d6034947bcb453fe0b4132769f5688a9c84 (patch) | |
| tree | ac4eb38d4ae42831ffc22b00ce48886052eff57a | |
| parent | 04c158cf11786730904d5af412eaa2321cb26853 (diff) | |
buildpackage: handle <vendor>/master
| -rwxr-xr-x | gbp/scripts/buildpackage.py | 2 | ||||
| -rw-r--r-- | tests/22_test_gbp_buildpackage.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index c5cd87a4..4641ae2c 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -412,7 +412,7 @@ def get_pbuilder_dist(options, repo, native=False): vendor = du.get_vendor().lower() suite = parts[1] if vendor == parts[0]: - dist = '' if suite == 'sid' else suite + dist = '' if suite in ['sid', 'master'] else suite else: dist = '%s_%s' % (parts[0], suite) elif len(parts) == 1 and native and branch in ['master', 'sid']: diff --git a/tests/22_test_gbp_buildpackage.py b/tests/22_test_gbp_buildpackage.py index 79645ac0..35f95700 100644 --- a/tests/22_test_gbp_buildpackage.py +++ b/tests/22_test_gbp_buildpackage.py @@ -34,6 +34,14 @@ class TestGbpBuildpackageDep14(DebianGitTestRepo): patch.assert_called_once_with() @patch('gbp.deb.get_vendor', return_value='Debian') + def test_get_pbuilder_dist_dep14_debian_master(self, patch): + branch = 'debian/master' + self.repo.create_branch(branch) + self.repo.set_branch(branch) + self.assertEqual(get_pbuilder_dist(self.options, self.repo), '') + patch.assert_called_once_with() + + @patch('gbp.deb.get_vendor', return_value='Debian') def test_get_pbuilder_dist_dep14_debian_suite(self, patch): branch = 'debian/squeeze-lts' self.repo.create_branch(branch) |