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

Move source package verification into ubuntutools.archive

Browse Source
This commit is contained in:
Stefano Rivera 2011-01-15 15:50:07 +02:00
parent e48a2c92d4
commit f4bbff9e9c
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
syncpackage
View File

@ -24,7 +24,6 @@ import debian.deb822
import debian.debian_support
import optparse
import os
import re
import shutil
import subprocess
import sys
@ -122,38 +121,15 @@ def sync_dsc(src_pkg, debian_dist, release, name, email, bugs, ubuntu_mirror,
ubuntu_source.getComponent(),
mirrors=[ubuntu_mirror])
ubu_pkg.pull_dsc()
need_orig = ubuntu_ver.upstream_version != new_ver.upstream_version
except udtexceptions.PackageNotFoundException:
ubuntu_ver = Version('~')
ubu_pkg = None
need_orig = True
Logger.info('%s does not exist in Ubuntu.', name)
Logger.debug('Source %s: current version %s, new version %s',
src_pkg.source, ubuntu_ver, new_ver)
# do we need the orig.tar.gz?
need_orig = True
fakesync_files = []
if ubuntu_ver.upstream_version == new_ver.upstream_version:
# We need to check if all .orig*.tar.* tarballs exist in Ubuntu
need_orig = False
deb_files = dict((e['name'], e['md5sum']) for e in src_pkg.dsc['Files']
if not e['name'].endswith('.dsc'))
ubu_files = dict((e['name'], e['md5sum']) for e in ubu_pkg.dsc['Files']
if not e['name'].endswith('.dsc'))
for name in deb_files.iterkeys():
if not re.match(r'.*\.orig(-[^.]+)?\.tar\.[^.]+$', name):
continue
if name in ubu_files:
if deb_files[name] != ubu_files[name]:
Logger.warn('The checksums of the file %s mismatch. '
'A fake sync is required.', name)
fakesync_files.append(name)
Logger.debug('Ubuntu version: %s', deb_files[name])
Logger.debug('Debian version: %s', ubu_files[name])
else:
Logger.info('%s does not exist in Ubuntu.',
name)
need_orig = True
Logger.debug('Needs source tarball: %s', str(need_orig))
cur_ver = ubuntu_ver.get_related_debian_version()
@ -165,8 +141,11 @@ def sync_dsc(src_pkg, debian_dist, release, name, email, bugs, ubuntu_mirror,
src_pkg.pull()
src_pkg.unpack()
# Do a fake sync if required
if fakesync_files:
fakesync = not ubu_pkg.verify_orig()
if fakesync:
Logger.warn('The checksums of the Debian and Ubuntu packages mismatch. '
'A fake sync is required.')
# Download Ubuntu files (override Debian source tarballs)
ubu_pkg.pull()
@ -180,7 +159,7 @@ def sync_dsc(src_pkg, debian_dist, release, name, email, bugs, ubuntu_mirror,
line = open("debian/changelog").readline()
debian_dist = line.split(" ")[2].strip(";")
if len(fakesync_files) == 0:
if not fakesync:
# create the changes file
changes_filename = "%s_%s_source.changes" % \
(src_pkg.source, new_ver.strip_epoch())

19
ubuntutools/archive.py
View File

@ -34,6 +34,7 @@ import os.path
import subprocess
import urllib2
import urlparse
import re
import sys
import debian.deb822
@ -317,6 +318,24 @@ class SourcePackage(object):
else:
raise DownloadError('File %s could not be found' % name)
def verify(self):
"""Verify that the source package in workdir matches the dsc.
Return boolean
"""
return all(self.dsc.verify_file(os.path.join(self.workdir,
entry['name']))
for entry in self.dsc['Files'])
def verify_orig(self):
"""Verify that the .orig files in workdir match the dsc.
Return boolean
"""
orig_re = re.compile(r'.*\.orig(-[^.]+)?\.tar\.[^.]+$')
return all(self.dsc.verify_file(os.path.join(self.workdir,
entry['name']))
for entry in self.dsc['Files']
if orig_re.match(entry['name']))
def unpack(self, destdir=None):
"Unpack in workdir"
cmd = ['dpkg-source', '-x', self.dsc_name]