Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-29 11:51:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Read source and version from dsc, not dsc filename

Browse Source
This commit is contained in:
Stefano Rivera 2011-01-15 15:59:59 +02:00
parent f4bbff9e9c
commit baf7a803ae
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ubuntutools/archive.py
View File

@ -120,11 +120,10 @@ class SourcePackage(object):
self.masters = [UDTConfig.defaults['%s_MIRROR' self.masters = [UDTConfig.defaults['%s_MIRROR'
% self.distribution.upper()]] % self.distribution.upper()]]
if dscfile is not None: if dscfile is not None:
d_source, d_version = os.path.basename(dscfile)[:-4].split('_')
if self.source is None: if self.source is None:
self.source = d_source self.source = 'unknown'
if self.version is None: if self.version is None:
self.version = d_version self.version = 'unknown'
self.version = debian.debian_support.Version(self.version) self.version = debian.debian_support.Version(self.version)
@ -223,12 +222,14 @@ class SourcePackage(object):
"Check that the dsc matches what we are expecting" "Check that the dsc matches what we are expecting"
assert os.path.exists(self.dsc_pathname) assert os.path.exists(self.dsc_pathname)
self._dsc_fetched = True self._dsc_fetched = True
old_pathname = self.dsc_pathname
assert self.source == self.dsc['Source'] self.source = self.dsc['Source']
version = debian.debian_support.Version(self.dsc['Version']) self.version = debian.debian_support.Version(self.dsc['Version'])
assert self.version.upstream_version == version.upstream_version
assert self.version.debian_revision == version.debian_revision # If source or version was previously unknown
self.version = version if self.dsc_pathname != old_pathname:
os.rename(old_pathname, self.dsc_pathname)
valid = False valid = False
message = None message = None