[Python-modules-commits] r31592 - in packages/python-git/trunk/debian (3 files)

[yoh at users.alioth.debian.org]

    Date: Thursday, December 18, 2014 @ 16:28:59
  Author: yoh
Revision: 31592

includes debian/patches/dont-choke-on-rc-version.patch

Modified:
  packages/python-git/trunk/debian/changelog
Deleted:
  packages/python-git/trunk/debian/patches/dont-choke-on-rc-version.patch
  packages/python-git/trunk/debian/patches/series

Modified: packages/python-git/trunk/debian/changelog
===================================================================
--- packages/python-git/trunk/debian/changelog	2014-12-18 16:28:53 UTC (rev 31591)
+++ packages/python-git/trunk/debian/changelog	2014-12-18 16:28:59 UTC (rev 31592)
@@ -3,6 +3,7 @@
   * Team upload
   * New upstream bugfix release (Closes: #769595)
     - detects untracked files correctly now (Closes: #739898)
+    - includes debian/patches/dont-choke-on-rc-version.patch
 
  -- Yaroslav Halchenko <debian at onerussian.com>  Wed, 17 Dec 2014 19:44:09 -0500
 

Deleted: packages/python-git/trunk/debian/patches/dont-choke-on-rc-version.patch
===================================================================
--- packages/python-git/trunk/debian/patches/dont-choke-on-rc-version.patch	2014-12-18 16:28:53 UTC (rev 31591)
+++ packages/python-git/trunk/debian/patches/dont-choke-on-rc-version.patch	2014-12-18 16:28:59 UTC (rev 31592)
@@ -1,22 +0,0 @@
-Author: "Marcus R. Brown" <mrbrown at precision-mojo.com>
-Description: Fix the `git version` parser to not choke on stuff like
-  '1.8.4.rc3'.
-Origin: https://github.com/gitpython-developers/GitPython/pull/88
-Bug-Debian: http://bugs.debian.org/722481
-
-diff --git a/git/cmd.py b/git/cmd.py
-index 576a530..6bd7901 100644
---- a/git/cmd.py
-+++ b/git/cmd.py
-@@ -234,7 +234,7 @@ def _set_cache_(self, attr):
- 		if attr == '_version_info':
- 			# We only use the first 4 numbers, as everthing else could be strings in fact (on windows)
- 			version_numbers = self._call_process('version').split(' ')[2]
--			self._version_info = tuple(int(n) for n in version_numbers.split('.')[:4])
-+			self._version_info = tuple(int(n) for n in version_numbers.split('.')[:4] if n.isdigit())
- 		else:
- 			super(Git, self)._set_cache_(attr)
- 		#END handle version info
--- 
-1.8.4
-

Deleted: packages/python-git/trunk/debian/patches/series
===================================================================
--- packages/python-git/trunk/debian/patches/series	2014-12-18 16:28:53 UTC (rev 31591)
+++ packages/python-git/trunk/debian/patches/series	2014-12-18 16:28:59 UTC (rev 31592)
@@ -1 +0,0 @@
-dont-choke-on-rc-version.patch