diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2006-11-03 17:24:00 +0100 |
|---|---|---|
| committer | Guido Guenther <agx@bogon.sigxcpu.org> | 2006-11-03 17:24:00 +0100 |
| commit | 7aa6ff42c4b0cebff45ee15e46765914edaf817f (patch) | |
| tree | e2f87cff5e9d65434406b63e028ee0fe00d0696b | |
| parent | 700bb61a80c24768d6ed2b2fa1e5560e320a4f28 (diff) | |
don't use a regexp for version parsing on import
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rw-r--r--[-rwxr-xr-x] | git-import-dsc | 10 | ||||
| -rw-r--r-- | git_buildpackage/deb_utils.py | 2 |
3 files changed, 11 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog index 23838d05..39995845 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,29 +1,22 @@ -git-buildpackage (0.2.9) git-buildpackage; urgency=low - - * UNRELEASED - * README: no need to mention git-load-dirs anymore, it's in unstable now. - Thanks John. - - -- Guido Guenther <agx@sigxcpu.org> Sun, 29 Oct 2006 12:28:49 +0100 - git-buildpackage (0.2.8) git-buildpackage; urgency=low * sanitze_version: strip of epochs + * don't use a regexp for version parsing on import * minor cosmetic cleanups all over the place - * + * README: no need to mention git-load-dirs anymore, it's in unstable now. + Thanks John. - -- Guido Guenther <agx@sigxcpu.org> Sun, 29 Oct 2006 12:28:23 +0100 + -- Guido Guenther <agx@sigxcpu.org> Fri, 3 Nov 2006 17:21:12 +0100 git-buildpackage (0.2.7) git-buildpackage; urgency=low * more robust regex matching - * sanitze all version numbers before running git-tag + * sanitize all version numbers before running git-tag -- Guido Guenther <agx@sigxcpu.org> Fri, 6 Oct 2006 18:40:12 +0200 git-buildpackage (0.2.6) git-buildpackage; urgency=low - * UNRELEASED * run pychecker during build * also filter out git metadata when building tarballs, not only when building diffs (affects Debian native packages) diff --git a/git-import-dsc b/git-import-dsc index 8907c56c..d40d6c48 100755..100644 --- a/git-import-dsc +++ b/git-import-dsc @@ -35,8 +35,7 @@ gitTag=GitTag() class DscPackage(object): """Parse the dsc file for verions, package names, etc""" pkgre=re.compile('Source:\s+(?P<pkg>.+)\s*') - versionre=re.compile("Version:\s(\d+\:)?(?P<upstream>[%s]+)(-(?P<debian>[%s]+))?\s*$" % - (debian_version_chars, debian_version_chars)) + versionre=re.compile("Version:\s(\d+\:)?(?P<version>[%s]+)\s*$" % (debian_version_chars,)) tarre=re.compile('^\s\w+\s\d+\s+(?P<tar>[^_]+_[^_]+(\.orig)?\.tar\.(gz|bz2))') def __init__(self, dscfile): @@ -45,15 +44,16 @@ class DscPackage(object): for line in f: m=self.versionre.match(line) if m: - self.upstream_version = m.group('upstream') - if m.group('debian'): - self.debian_version = m.group('debian') + if '-' in m.group('version'): + self.debian_version = m.group('version').split("-")[-1] + self.upstream_version = "-".join(m.group('version').split("-")[0:-1]) self.native = False print "Upstream version:", self.upstream_version print "Debian version:", self.debian_version else: print "Debian Native Package" self.native = True # Debian native package + upstream_version=m.group('version') print "Version:", self.upstream_version continue m=self.pkgre.match(line) diff --git a/git_buildpackage/deb_utils.py b/git_buildpackage/deb_utils.py index 7b8cd82a..d293c67c 100644 --- a/git_buildpackage/deb_utils.py +++ b/git_buildpackage/deb_utils.py @@ -4,5 +4,5 @@ # When trying to parse a version-number from a dsc or changes file, these are # the valid characters. -debian_version_chars='a-zA-Z\d.~+' +debian_version_chars='a-zA-Z\d.~+-' |