return update
def main(argv):
- changelog = 'debian/changelog'
retval = 0
parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='',
self.__parse_config_files()
OptionParser.__init__(self, option_class=GbpOption, usage=usage, version='%s %s' % (self.command, gbp_version))
- def _is_boolean(self, option_name, *args, **kwargs):
+ def _is_boolean(self, dummy, *unused, **kwargs):
"""is option_name a boolean option"""
ret = False
try:
import gbp.deb as du
from gbp.git import (GitRepositoryError, GitRepository, build_tag)
from gbp.command_wrappers import (GitTag, Command, RunAtCommand, CommandExecFailed,
- PristineTar, RemoveTree, GitAdd, PristineTar)
+ PristineTar, RemoveTree, GitAdd)
from gbp.config import (GbpOptionParser, GbpOptionGroup)
from gbp.errors import GbpError
from glob import glob
os.unsetenv("GIT_INDEX_FILE")
return tree
-def drop_index(repo):
+def drop_index():
"""drop our custom index"""
if os.path.exists(wc_index):
os.unlink(wc_index)
gbp.log.err(err)
retval = 1
finally:
- drop_index(repo)
+ drop_index()
if not options.tag_only:
if options.export_dir and options.purge and not retval:
from gbp.config import GbpOptionParser, GbpOptionGroup
from gbp.errors import GbpError
from gbp.deb import parse_changelog, NoChangelogError, is_native, compare_versions
-from gbp.command_wrappers import (Command, CommandExecFailed)
user_customizations = {}
snapshot_re = re.compile("\s*\*\* SNAPSHOT build @(?P<commit>[a-z0-9]+)\s+\*\*")
def system(cmd):
try:
- Command(cmd, shell=True)()
- except CommandExecFailed:
+ gbpc.Command(cmd, shell=True)()
+ except gbpc.CommandExecFailed:
raise GbpError
return dch_options
-def process_editor_option(options, parser):
+def process_editor_option(options):
# Determine Editor and check if we need it
states = ['always']
changelog = 'debian/changelog'
until = 'HEAD'
found_snapshot_header = False
- first_commit = None
version_change = {}
try:
(options, args) = parser.parse_args(argv[1:])
gbp.log.setup(options.color, options.verbose)
dch_options = process_options(options, parser)
- editor_cmd = process_editor_option(options, parser)
+ editor_cmd = process_editor_option(options)
try:
try:
return dsc
-def apply_patch(diff, unpack_dir):
+def apply_patch(diff):
"Apply patch to a source tree"
- d = os.path.abspath(unpack_dir)
pipe = pipes.Template()
pipe.prepend('gunzip -c %s' % diff, '.-')
pipe.append('patch -p1 --quiet', '-.')
return True
-def apply_deb_tgz(deb_tgz, unpack_dir):
+def apply_deb_tgz(deb_tgz):
"""Apply .debian.tar.gz (V3 source format)"""
- unpackArchive = gbpc.UnpackTarArchive(deb_tgz, ".")()
+ gbpc.UnpackTarArchive(deb_tgz, ".")()
return True
try:
os.chdir(unpack_dir)
- if src.diff and not apply_patch(src.diff, unpack_dir):
+ if src.diff and not apply_patch(src.diff):
raise GbpError
- if src.deb_tgz and not apply_deb_tgz(src.deb_tgz, unpack_dir):
+ if src.deb_tgz and not apply_deb_tgz(src.deb_tgz):
raise GbpError
if os.path.exists('debian/rules'):
author, email = parseaddr(dch['Maintainer'])
if not (author and email):
gbp.log.warn("Failed to parse maintainer")
-
commit = repo.commit_dir(unpack_dir,
"Imported Debian patch %s" % version,
branch = options.debian_branch,
import glob
import os
-import pipes
-import re
import sys
import tempfile
import gbp.command_wrappers as gbpc
epoch = '%s:' % cp['Epoch']
info = { 'version': "%s%s-1" % (epoch, version) }
env = { 'GBP_BRANCH': options.debian_branch }
- cmd = gbpc.Command(options.postimport % info, extra_env=env, shell=True)()
+ gbpc.Command(options.postimport % info, extra_env=env, shell=True)()
except gbpc.CommandExecFailed:
raise GbpError, "Import of %s failed" % archive
except GbpNothingImported, err: