Merge changes Id002bf1b,I45d84345 into experimental-rpm

* changes:
  Packaging: fixed distribution of files
  Fixed testcase for test_find_tag.

6 files changed, 42 insertions, 30 deletions

diff --git a/debian/git-buildpackage-common.install b/debian/git-buildpackage-common.install
index 3fdd5528..18f96633 100644
--- a/debian/git-buildpackage-common.install
+++ b/debian/git-buildpackage-common.install
@@ -1,15 +1,9 @@
 usr/bin/gbp-clone
 usr/bin/gbp-pull
-#usr/share/pyshared/gbp/*.py
-#usr/share/pyshared/gbp/scripts/clone.py
-#usr/share/pyshared/gbp/scripts/pull.py
-#usr/share/pyshared/gbp/scripts/common/*.py
-#usr/share/pyshared/gbp/git/*.py
-#usr/share/pyshared/gbp/pkg/*.py
-usr/lib/python*/dist-packages/gbp/*.py
-usr/lib/python2.7/dist-packages/gbp/scripts/clone.py
-usr/lib/python2.7/dist-packages/gbp/scripts/pull.py
-usr/lib/python2.7/dist-packages/gbp/scripts/common/*.py
-usr/lib/python2.7/dist-packages/gbp/git/*.py
-usr/lib/python2.7/dist-packages/gbp/pkg/*.py
+usr/lib/python*/dist-packages/gbp/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/clone.py*
+usr/lib/python*/dist-packages/gbp/scripts/pull.py*
+usr/lib/python*/dist-packages/gbp/scripts/common/*.py*
+usr/lib/python*/dist-packages/gbp/git/*.py*
+usr/lib/python*/dist-packages/gbp/pkg/*.py*
 etc/git-buildpackage/gbp.conf
diff --git a/debian/git-buildpackage-rpm.install b/debian/git-buildpackage-rpm.install
index bef065cf..8c49491e 100644
--- a/debian/git-buildpackage-rpm.install
+++ b/debian/git-buildpackage-rpm.install
@@ -1,5 +1,3 @@
-usr/bin/gbp-pq-rpm
-usr/bin/git-buildpackage-rpm
-usr/bin/git-import-orig-rpm
-usr/bin/git-import-srpm
-usr/lib/python*/dist-packages/gbp/rpm/*
+usr/bin/*rpm*
+usr/lib/python*/dist-packages/gbp/rpm/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/*rpm*.py*
diff --git a/debian/git-buildpackage.install b/debian/git-buildpackage.install
index a420cb1c..7a276d7e 100644
--- a/debian/git-buildpackage.install
+++ b/debian/git-buildpackage.install
@@ -5,5 +5,12 @@ usr/bin/git-import-dsc
 usr/bin/git-import-dscs
 usr/bin/git-import-orig
 usr/bin/git-pbuilder
-#usr/share/pyshared/gbp/deb/*
-usr/lib/python*/dist-packages/gbp/deb/*
+usr/bin/gbp-create-remote-repo
+usr/lib/python*/dist-packages/gbp/deb/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/pq.py*
+usr/lib/python*/dist-packages/gbp/scripts/buildpackage.py*
+usr/lib/python*/dist-packages/gbp/scripts/dch.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_dsc.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_dscs.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_orig.py*
+usr/lib/python*/dist-packages/gbp/scripts/create_remote_repo.py*
diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 5730ce0b..c9b77db0 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -518,8 +518,8 @@ class GitRepository(object):
         tag, err, ret = self._git_inout('describe', args, capture_stderr=True)
         if ret:
             raise GitRepositoryError("Can't find tag for %s. Git error: %s" % \
-                                         (commit, err))
-        return tag[0].strip()
+                                         (commit, err.strip()))
+        return tag.strip()
 
     def get_tags(self, pattern=None):
         """
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index dc3bd4b2..f2c60857 100644
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -76,6 +76,7 @@ rm -rf %{buildroot}%{python_sitelib}/*info
 
 %files
 %defattr(-,root,root,-)
+%dir %{python_sitelib}/gbp/deb
 %{_bindir}/gbp-pq
 %{_bindir}/git-buildpackage
 %{_bindir}/git-dch
@@ -85,24 +86,36 @@ rm -rf %{buildroot}%{python_sitelib}/*info
 %{_bindir}/git-pbuilder
 %{_bindir}/gbp-create-remote-repo
 %{python_sitelib}/gbp/deb/
+%{python_sitelib}/gbp/scripts/pq.py*
+%{python_sitelib}/gbp/scripts/buildpackage.py*
+%{python_sitelib}/gbp/scripts/dch.py*
+%{python_sitelib}/gbp/scripts/import_dsc.py*
+%{python_sitelib}/gbp/scripts/import_dscs.py*
+%{python_sitelib}/gbp/scripts/import_orig.py*
+%{python_sitelib}/gbp/scripts/create_remote_repo.py*
 
 %files common
 %defattr(-,root,root,-)
 %{_bindir}/gbp-clone
 %{_bindir}/gbp-pull
-%{python_sitelib}/gbp
+%dir %{python_sitelib}/gbp
+%dir %{python_sitelib}/gbp/git
+%dir %{python_sitelib}/gbp/pkg
+%dir %{python_sitelib}/gbp/scripts
+%dir %{python_sitelib}/gbp/scripts/common
 %{python_sitelib}/gbp/*.py*
-%{python_sitelib}/gbp/git/
-%{python_sitelib}/gbp/pkg/
+%{python_sitelib}/gbp/scripts/__init__.py*
 %{python_sitelib}/gbp/scripts/clone.py*
 %{python_sitelib}/gbp/scripts/pull.py*
+%{python_sitelib}/gbp/scripts/common/*.py*
+%{python_sitelib}/gbp/git/*.py*
+%{python_sitelib}/gbp/pkg/*.py*
 %config %{_sysconfdir}/git-buildpackage
 
 
 %files rpm
 %defattr(-,root,root,-)
-%{_bindir}/gbp-pq-rpm
-%{_bindir}/git-buildpackage-rpm
-%{_bindir}/git-import-orig-rpm
-%{_bindir}/git-import-srpm
-%{python_sitelib}/gbp/rpm/
+%dir %{python_sitelib}/gbp/rpm
+%{_bindir}/*rpm*
+%{python_sitelib}/gbp/scripts/*rpm.py*
+%{python_sitelib}/gbp/rpm/*py*
diff --git a/tests/test_GitRepository.py b/tests/test_GitRepository.py
index 4367f936..73bb9fd6 100644
--- a/tests/test_GitRepository.py
+++ b/tests/test_GitRepository.py
@@ -217,7 +217,7 @@ def test_find_tag():
     >>> repo.find_tag('HEAD', pattern='foo*')
     Traceback (most recent call last):
     ...
-    GitRepositoryError: Can't find tag for HEAD
+    GitRepositoryError: Can't find tag for HEAD. Git error: fatal: No names found, cannot describe anything.
     """
 
 def test_move_tag():