diff --git a/rel-eng/packages/subscription-manager b/rel-eng/packages/subscription-manager
index 15e49bc..8181efc 100644
--- a/rel-eng/packages/subscription-manager
+++ b/rel-eng/packages/subscription-manager
@@ -1 +1 @@
-1.15.9-1 ./
+1.15.9-2 ./
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index 2e244af..6c86a16 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -1,3 +1,4 @@
-[buildconfig]
-builder = tito.builder.Builder
-tagger = tito.tagger.VersionTagger
+[globalconfig]
+default_builder = tito.distributionbuilder.DistributionBuilder
+default_tagger = tito.tagger.ReleaseTagger
+
diff --git a/src/rct/printing.py b/src/rct/printing.py
index f03e37f..39496b5 100644
--- a/src/rct/printing.py
+++ b/src/rct/printing.py
@@ -178,11 +178,18 @@ class ProductCertificatePrinter(CertificatePrinter):
product_printer = ProductPrinter()
s = []
if not self.skip_products:
- for product in sorted(cert.products, key=lambda product: product.id):
+ for product in sorted(cert.products, key=self.product_id_int):
s.append(product_printer.as_str(product))
return "%s\n%s" % (CertificatePrinter.cert_to_str(self, cert), "\n".join(s))
+ @staticmethod
+ def product_id_int(product):
+ try:
+ return int(product.id)
+ except ValueError:
+ return product.id
+
class EntitlementCertificatePrinter(ProductCertificatePrinter):
def __init__(self, skip_content=False, skip_products=False):
diff --git a/src/subscription_manager/managercli.py b/src/subscription_manager/managercli.py
index 4219ce1..706a353 100644
--- a/src/subscription_manager/managercli.py
+++ b/src/subscription_manager/managercli.py
@@ -534,6 +534,8 @@ class UserPassCommand(CliCommand):
@property
def username(self):
if not self._username:
+ print _("Registering to: %s%s:%s") % \
+ (cfg.get("server", "hostname"), cfg.get("server", "prefix"), cfg.get("server", "port"))
(self._username, self._password) = self._get_username_and_password(
self.options.username, self.options.password)
return self._username
diff --git a/subscription-manager.spec b/subscription-manager.spec
index 9d3fe82..de5695b 100644
--- a/subscription-manager.spec
+++ b/subscription-manager.spec
@@ -37,7 +37,7 @@
Name: subscription-manager
Version: 1.15.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tools and libraries for subscription and repository management
Group: System Environment/Base
License: GPLv2
@@ -197,7 +197,7 @@ This package contains the firstboot screens for subscription-manager.
Summary: initial-setup screens for subscription-manager
Group: System Environment/Base
Requires: %{name}-gui = %{version}-%{release}
-Requires: initial-setup
+Requires: initial-setup-gui
Obsoletes: subscription-manager-firstboot < 1.15.3-1
%description -n subscription-manager-initial-setup-addon
@@ -527,6 +527,12 @@ fi
%endif
%changelog
+* Mon Jul 27 2015 Chris Rog <crog@redhat.com> 1.15.9-2
+- Updated initial-setup-addon package requirement to initial-setup-gui
+ (crog@redhat.com)
+- 985157: Display the URL that is the registration target (wpoteat@redhat.com)
+- Cast product.id to int for sort in cat-cert (alikins@redhat.com)
+
* Thu Jul 23 2015 Chris Rog <crog@redhat.com> 1.15.9-1
- 1246146: Changed initial-setup-addon package requirement from subman to
subman-gui (crog@redhat.com)