Restore building of specific tags.

This commit is contained in:
Devan Goodwin 2014-01-09 15:52:01 -04:00
parent 05e3b80205
commit 6097b7da59
4 changed files with 11 additions and 4 deletions

View file

@ -1115,6 +1115,10 @@ class ExternalSourceBuilder(ConfigObject, BuilderBase):
pkg_config=pkg_config, global_config=global_config,
user_config=user_config, args=args, **kwargs)
if tag:
error_out("ExternalSourceBuilder does not support building "
"specific tags.")
# Project directory where we started this build:
self.start_dir = os.getcwd()

View file

@ -374,7 +374,7 @@ class BuildModule(BaseCliModule):
build_dir = os.path.normpath(os.path.abspath(self.options.output_dir))
package_name = get_project_name(tag=self.options.tag)
build_tag = None
build_tag = self.options.tag
if self.options.release:
error_out("'tito build --release' is now deprecated. Please see 'tito release'.")

View file

@ -108,8 +108,8 @@ def error_out(error_msgs):
else:
print("ERROR: %s" % error_msgs)
print
if 'DEBUG' in os.environ:
traceback.print_stack()
# if 'DEBUG' in os.environ:
# traceback.print_stack()
sys.exit(1)

View file

@ -93,7 +93,10 @@ class ExternalSourceBuilderTests(TitoGitTestFixture):
self.assertTrue(os.path.exists(
os.path.join(self.output_dir, 'noarch/extsrc-0.0.2-1.fc20.noarch.rpm')))
# test_tag_rejected
def test_tag_rejected(self):
self.assertRaises(SystemExit, tito,
'build --tag=extsrc-0.0.1-1 --rpm --output=%s --source=%s' %
(self.output_dir, self.source_filename))
class MultiProjectTests(TitoGitTestFixture):