options.packaging_dir = os.path.dirname(specfile)
if not os.path.exists(specfile):
raise rpm.NoSpecError("Failed to export specfile: %s" % options.spec_file)
+ spec = rpm.SpecFile(specfile)
else:
- specfile = rpm.guess_spec(os.path.join(dump_dir, options.packaging_dir),
- True,
- os.path.basename(repo.path) + '.spec')
- spec = rpm.SpecFile(specfile)
- gbp.log.debug("Using spec file '%s'" % specfile)
+ spec = rpm.guess_spec(os.path.join(dump_dir, options.packaging_dir),
+ True,
+ os.path.basename(repo.path) + '.spec')
+ gbp.log.debug("Using spec file '%s'" % spec.specfile)
if not options.tag_only:
# Setup builder opts
import gbp.command_wrappers as gbpc
import string
from gbp.pkg import parse_archive_filename
-from gbp.rpm import (RpmUpstreamSource, SpecFile, NoSpecError, parse_spec,
- guess_spec, guess_spec_repo)
+from gbp.rpm import (RpmUpstreamSource, SpecFile, NoSpecError, guess_spec,
+ guess_spec_repo)
from gbp.rpm.policy import RpmPkgPolicy
from gbp.rpm.git import (GitRepositoryError, RpmGitRepository)
from gbp.config import GbpOptionParserRpm, GbpOptionGroup, no_upstream_branch_msg
# Try to find the source package name
try:
- spec = parse_spec(guess_spec(os.path.join(repo.path, options.packaging_dir),
- True,
- os.path.basename(repo.path) + '.spec'))
+ preferred_fn = os.path.basename(repo.path) + '.spec'
+ spec = guess_spec(os.path.join(repo.path, options.packaging_dir), True,
+ preferred_fn)
sourcepackage = spec.name
except NoSpecError:
try:
# Check the spec file from the repository, in case
# we're not on the packaging-branch (but upstream, for
# example).
- specfile = guess_spec_repo(repo, options.packaging_branch, options.packaging_dir)
- spec = SpecFile(specfile)
+ spec = guess_spec_repo(repo, options.packaging_branch,
+ options.packaging_dir)
sourcepackage = spec.name
except NoSpecError:
if options.interactive:
# Find and parse .spec file
try:
if options.spec_file != 'auto':
- specfilename = options.spec_file
options.packaging_dir = os.path.dirname(specfilename)
+ spec = SpecFile(options.packaging_dir)
else:
- specfilename = guess_spec(options.packaging_dir,
- True,
- os.path.basename(repo.path) + '.spec')
- spec = SpecFile(specfilename)
+ spec = guess_spec(options.packaging_dir, True,
+ os.path.basename(repo.path) + '.spec')
except KeyError:
raise GbpError, "Can't parse spec"
# Find and parse .spec file
try:
if options.spec_file != 'auto':
- specfilename = options.spec_file
- options.packaging_dir = os.path.dirname(specfilename)
+ options.packaging_dir = os.path.dirname(options.spec_file)
+ spec = SpecFile(options.spec_file)
else:
- specfilename = guess_spec(options.packaging_dir,
- True,
- os.path.basename(repo.path) + '.spec')
- spec = SpecFile(specfilename)
+ spec = guess_spec(options.packaging_dir, True,
+ os.path.basename(repo.path) + '.spec')
except KeyError:
raise GbpError, "Can't parse spec"
# Find and parse .spec file
try:
if options.spec_file != 'auto':
- specfilename = options.spec_file
- options.packaging_dir = os.path.dirname(specfilename)
+ options.packaging_dir = os.path.dirname(options.spec_file)
+ spec = SpecFile(options.spec_file)
else:
- specfilename = guess_spec(options.packaging_dir,
- True,
- os.path.basename(repo.path) + '.spec')
- spec = SpecFile(specfilename)
+ spec = guess_spec(options.packaging_dir, True,
+ os.path.basename(repo.path) + '.spec')
except KeyError:
raise GbpError, "Can't parse spec"