From 6097b7da594788cb469a234b676aa72989c97163 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Thu, 9 Jan 2014 15:52:01 -0400
Subject: [PATCH] Restore building of specific tags.

---
 src/tito/builder.py                   | 4 ++++
 src/tito/cli.py                       | 2 +-
 src/tito/common.py                    | 4 ++--
 test/functional/multiproject_tests.py | 5 ++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/tito/builder.py b/src/tito/builder.py
index d0e51b1..1bec68a 100644
--- a/src/tito/builder.py
+++ b/src/tito/builder.py
@@ -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()
 
diff --git a/src/tito/cli.py b/src/tito/cli.py
index f4e4c95..401499d 100644
--- a/src/tito/cli.py
+++ b/src/tito/cli.py
@@ -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'.")
diff --git a/src/tito/common.py b/src/tito/common.py
index 1058dec..00f3364 100644
--- a/src/tito/common.py
+++ b/src/tito/common.py
@@ -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)
 
 
diff --git a/test/functional/multiproject_tests.py b/test/functional/multiproject_tests.py
index 76198e2..07c4078 100644
--- a/test/functional/multiproject_tests.py
+++ b/test/functional/multiproject_tests.py
@@ -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):