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