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

* syncpackage:

Browse Source 
- Prepend script name to every output
  - Output every executed command in verbose mode
This commit is contained in:
Benjamin Drung 2010-07-30 03:32:23 +02:00
parent 3b4c72019a
commit c3bd2726c7
2 changed files with 59 additions and 32 deletions

9
debian/changelog vendored

@ -13,8 +13,11 @@ ubuntu-dev-tools (0.101) UNRELEASED; urgency=low
[ Benjamin Drung ] [ Benjamin Drung ]
* Bump Standards-Version to 3.9.1 (no changes required). * Bump Standards-Version to 3.9.1 (no changes required).
* Switch to dpkg-source 3.0 (native) format. * Switch to dpkg-source 3.0 (native) format.
* syncpackage: Use Version class from python-debian to fix extraction of * syncpackage:
upstream version for debian versions that contain more than one dash. - Use Version class from python-debian to fix extraction of upstream
version for debian versions that contain more than one dash.
- Prepend script name to every output
- Output every executed command in verbose mode
[ Michael Bienia ] [ Michael Bienia ]
* ubuntutools/lpapi/lpapicache.py: Use the new LP API method * ubuntutools/lpapi/lpapicache.py: Use the new LP API method
@ -24,7 +27,7 @@ ubuntu-dev-tools (0.101) UNRELEASED; urgency=low
* requestsync: Fix bug where the variable 'hasLP' is not always set * requestsync: Fix bug where the variable 'hasLP' is not always set
(lp: #607874). (lp: #607874).
-- Benjamin Drung <bdrung@ubuntu.com> Fri, 30 Jul 2010 00:44:55 +0200 -- Benjamin Drung <bdrung@ubuntu.com> Fri, 30 Jul 2010 03:26:59 +0200
ubuntu-dev-tools (0.100) maverick; urgency=low ubuntu-dev-tools (0.100) maverick; urgency=low

82
syncpackage

@ -56,7 +56,7 @@ class File(object):
def is_source_file(self): def is_source_file(self):
return re.match(".*\.orig.*\.tar\..*", self.name) return re.match(".*\.orig.*\.tar\..*", self.name)
def download(self, verbose=False): def download(self, script_name=None, verbose=False):
'''Download file (by URL) to the current directory. '''Download file (by URL) to the current directory.
If the file is already present, this function does nothing.''' If the file is already present, this function does nothing.'''
@ -71,7 +71,7 @@ class File(object):
if not file_exists: if not file_exists:
if verbose: if verbose:
print 'downloading', self.url print '%s: I: Downloading %s...' % (script_name, self.url)
urllib.urlretrieve(self.url, self.name) urllib.urlretrieve(self.url, self.name)
@ -101,7 +101,14 @@ class Version(debian.debian_support.Version):
def is_modified_in_ubuntu(self): def is_modified_in_ubuntu(self):
return self.full_version.find('ubuntu') > 0 return self.full_version.find('ubuntu') > 0
def remove_signature(dscname, verbose=False):
def print_command(script_name, cmd):
for i in xrange(len(cmd)):
if cmd[i].find(" ") >= 0:
cmd[i] = '"' + cmd[i] + '"'
print "%s: I: %s" % (script_name, " ".join(cmd))
def remove_signature(dscname, script_name=None, verbose=False):
'''Removes the signature from a .dsc file if the .dsc file is signed.''' '''Removes the signature from a .dsc file if the .dsc file is signed.'''
f = open(dscname) f = open(dscname)
@ -146,7 +153,7 @@ def dsc_getfiles(dsc):
f.close() f.close()
return files return files
def add_fixed_bugs(changes, bugs, verbose=False): def add_fixed_bugs(changes, bugs, script_name=None, verbose=False):
'''Add additional Launchpad bugs to the list of fixed bugs in changes file.''' '''Add additional Launchpad bugs to the list of fixed bugs in changes file.'''
changes = filter(lambda l: l.strip() != "", changes.split("\n")) changes = filter(lambda l: l.strip() != "", changes.split("\n"))
@ -165,7 +172,7 @@ def add_fixed_bugs(changes, bugs, verbose=False):
return "\n".join(changes + [""]) return "\n".join(changes + [""])
def sync_dsc(dscurl, debian_dist, release, name, email, bugs, keyid=None, verbose=False): def sync_dsc(script_name, dscurl, debian_dist, release, name, email, bugs, keyid=None, verbose=False):
assert dscurl.endswith(".dsc") assert dscurl.endswith(".dsc")
dscname = os.path.basename(dscurl) dscname = os.path.basename(dscurl)
basepath = os.path.dirname(dscurl) basepath = os.path.dirname(dscurl)
@ -191,15 +198,17 @@ def sync_dsc(dscurl, debian_dist, release, name, email, bugs, keyid=None, verbos
# No need to continue if version is not greater than current one # No need to continue if version is not greater than current one
if new_ver <= ubuntu_ver: if new_ver <= ubuntu_ver:
raise Exception('%s version %s is not greater than already available %s' % (srcpkg, new_ver, ubuntu_ver)) raise Exception('%s version %s is not greater than already available %s' % \
(srcpkg, new_ver, ubuntu_ver))
if verbose: if verbose:
print 'Source %s: current version %s, new version %s' % (srcpkg, ubuntu_ver, new_ver) print '%s: D: Source %s: current version %s, new version %s' % \
(script_name, srcpkg, ubuntu_ver, new_ver)
files = dsc_getfiles(dscurl) files = dsc_getfiles(dscurl)
source_files = filter(lambda f: f.is_source_file(), files) source_files = filter(lambda f: f.is_source_file(), files)
if verbose: if verbose:
print 'Files:', map(lambda x: x.get_name(), files) print '%s: D: Files: %s' % (script_name, str(map(lambda x: x.get_name(), files)))
print 'Source files:', map(lambda x: x.get_name(), source_files) print '%s: D: Source files: %s' % (script_name, str(map(lambda x: x.get_name(), source_files)))
map(lambda f: f.download(verbose), files) map(lambda f: f.download(verbose), files)
if ubuntu_dsc is None: if ubuntu_dsc is None:
@ -218,24 +227,32 @@ def sync_dsc(dscurl, debian_dist, release, name, email, bugs, keyid=None, verbos
if len(ubuntu_file) == 0: if len(ubuntu_file) == 0:
# The source file does not exist in Ubuntu # The source file does not exist in Ubuntu
if verbose: if verbose:
print "%s does not exist in Ubuntu." % (source_file.get_name()) print "%s: I: %s does not exist in Ubuntu." % \
(script_name, source_file.get_name())
need_orig = True need_orig = True
elif not ubuntu_file[0] == source_file: elif not ubuntu_file[0] == source_file:
# The checksum of the files mismatch -> We need a fake sync # The checksum of the files mismatch -> We need a fake sync
print "WARNING! The checksum of the file %s mismatch. A fake sync is required." % (source_file.get_name()) print "%s: Warning: The checksum of the file %s mismatch. A fake sync is required." % \
(script_name, source_file.get_name())
fakesync_files.append(ubuntu_file[0]) fakesync_files.append(ubuntu_file[0])
if verbose: if verbose:
print "Ubuntu version:", ubuntu_file[0] print "%s: D: Ubuntu version: %s" % (script_name, ubuntu_file[0])
print "Debian version:", source_file print "%s: D: Debian version: %s" % (script_name, source_file)
if verbose: if verbose:
print 'needs orig.tar.gz', need_orig print '%s: D: needs source tarball: %s' % (script_name, str(need_orig))
if ubuntu_ver.is_modified_in_ubuntu(): if ubuntu_ver.is_modified_in_ubuntu():
print 'WARNING! Overwriting modified Ubuntu version %s, setting current version to %s' % (ubuntu_ver, cur_ver) print '%s: Warning: Overwriting modified Ubuntu version %s, setting current version to %s' % \
(script_name, ubuntu_ver, cur_ver)
cur_ver = ubuntu_ver.get_related_debian_version() cur_ver = ubuntu_ver.get_related_debian_version()
# extract package # extract package
subprocess.check_call(['dpkg-source', '-x', dscname]) cmd = ['dpkg-source', '-x', dscname]
if not verbose:
cmd.insert(1, "-q")
if verbose:
print_command(script_name, cmd)
subprocess.check_call(cmd)
# Do a fake sync if required # Do a fake sync if required
if len(fakesync_files) > 0: if len(fakesync_files) > 0:
@ -245,7 +262,7 @@ def sync_dsc(dscurl, debian_dist, release, name, email, bugs, keyid=None, verbos
# change into package directory # change into package directory
directory = srcpkg + '-' + new_ver.upstream_version directory = srcpkg + '-' + new_ver.upstream_version
if verbose: if verbose:
print "cd " + directory print_command(script_name, ["cd", directory])
os.chdir(directory) os.chdir(directory)
# read Debian distribution from debian/changelog if not specified # read Debian distribution from debian/changelog if not specified
@ -265,7 +282,7 @@ def sync_dsc(dscurl, debian_dist, release, name, email, bugs, keyid=None, verbos
if not verbose: if not verbose:
cmd += ["-q"] cmd += ["-q"]
if verbose: if verbose:
print " ".join(cmd) + " > ../" + changes_file print_command(script_name, cmd + [">", "../" + changes_file])
changes = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0] changes = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
# Add additional bug numbers # Add additional bug numbers
@ -273,6 +290,8 @@ def sync_dsc(dscurl, debian_dist, release, name, email, bugs, keyid=None, verbos
changes = add_fixed_bugs(changes, bugs, verbose) changes = add_fixed_bugs(changes, bugs, verbose)
# remove extracted (temporary) files # remove extracted (temporary) files
if verbose:
print_command(script_name, ["cd", ".."])
os.chdir('..') os.chdir('..')
shutil.rmtree(directory, True) shutil.rmtree(directory, True)
@ -287,11 +306,11 @@ def sync_dsc(dscurl, debian_dist, release, name, email, bugs, keyid=None, verbos
if not keyid is None: if not keyid is None:
cmd.insert(1, "-k" + keyid) cmd.insert(1, "-k" + keyid)
if verbose: if verbose:
print " ".join(cmd) print_command(script_name, cmd)
subprocess.check_call(cmd) subprocess.check_call(cmd)
else: else:
# Create fakesync changelog entry # Create fakesync changelog entry
new_ver = Version(new_version.full_version + "fakesync1") new_ver = Version(new_ver.full_version + "fakesync1")
changes_file = "%s_%s_source.changes" % (srcpkg, new_ver.strip_epoch()) changes_file = "%s_%s_source.changes" % (srcpkg, new_ver.strip_epoch())
if len(bugs) > 0: if len(bugs) > 0:
message = "Fake sync due to mismatching orig tarball (LP: %s)." % \ message = "Fake sync due to mismatching orig tarball (LP: %s)." % \
@ -300,10 +319,15 @@ def sync_dsc(dscurl, debian_dist, release, name, email, bugs, keyid=None, verbos
message = "Fake sync due to mismatching orig tarball." message = "Fake sync due to mismatching orig tarball."
cmd = ["dch", "-v", new_ver.full_version, "-D", release, message] cmd = ["dch", "-v", new_ver.full_version, "-D", release, message]
env = {"DEBFULLNAME": name, "DEBEMAIL": email} env = {"DEBFULLNAME": name, "DEBEMAIL": email}
if verbose:
print_command(script_name, cmd)
subprocess.check_call(cmd, env=env)
# update the Maintainer field # update the Maintainer field
subprocess.check_call(cmd, env=env) cmd = ["update-maintainer"]
subprocess.check_call(["update-maintainer"]) if verbose:
print_command(script_name, cmd)
subprocess.check_call(cmd)
# Build source package # Build source package
cmd = ["debuild", "--no-lintian", "-S", "-v" + cur_ver.full_version] cmd = ["debuild", "--no-lintian", "-S", "-v" + cur_ver.full_version]
@ -312,11 +336,9 @@ def sync_dsc(dscurl, debian_dist, release, name, email, bugs, keyid=None, verbos
if not keyid is None: if not keyid is None:
cmd += ["-k" + keyid] cmd += ["-k" + keyid]
if verbose: if verbose:
print " ".join(cmd) print_command(script_name, cmd)
subprocess.check_call(cmd) subprocess.check_call(cmd)
print changes_file
def get_debian_dscurl(package, dist, release, version=None, component=None): def get_debian_dscurl(package, dist, release, version=None, component=None):
if dist is None: if dist is None:
dist="unstable" dist="unstable"
@ -383,10 +405,12 @@ if __name__ == "__main__":
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if len(args) == 0: if len(args) == 0:
print >> sys.stderr, "%s: Error: No .dsc URL/path or package name specified." % (script_name) print >> sys.stderr, "%s: Error: No .dsc URL/path or package name specified." % \
(script_name)
sys.exit(1) sys.exit(1)
elif len(args) > 1: elif len(args) > 1:
print >> sys.stderr, script_name + ": Error: Multiple .dsc URLs/paths or package names specified: " + ", ".join(args) print >> sys.stderr, "%: Error: Multiple .dsc URLs/paths or package names specified: %s" % \
(script_name, ", ".join(args))
sys.exit(1) sys.exit(1)
invalid_bug_numbers = filter(lambda x: not x.isdigit(), options.bugs) invalid_bug_numbers = filter(lambda x: not x.isdigit(), options.bugs)
@ -406,6 +430,6 @@ if __name__ == "__main__":
options.debversion, options.component) options.debversion, options.component)
if options.verbose: if options.verbose:
print ".dsc url: " + dscurl print "%s: D: .dsc url: %s" % (script_name, dscurl)
sync_dsc(dscurl, options.dist, options.release, options.uploader_name, sync_dsc(script_name, dscurl, options.dist, options.release, options.uploader_name,
options.uploader_email, options.bugs, options.keyid, options.verbose) options.uploader_email, options.bugs, options.keyid, options.verbose)