Blame SOURCES/subscription-manager-1.15.9-5-to-subscription-manager-1.15.9-6.patch

d88f46
diff --git a/rel-eng/packages/subscription-manager b/rel-eng/packages/subscription-manager
d88f46
index 3d3b701..77a1238 100644
d88f46
--- a/rel-eng/packages/subscription-manager
d88f46
+++ b/rel-eng/packages/subscription-manager
d88f46
@@ -1 +1 @@
d88f46
-1.15.9-5 ./
d88f46
+1.15.9-6 ./
d88f46
diff --git a/src/subscription_manager/entcertlib.py b/src/subscription_manager/entcertlib.py
d88f46
index 6ecf74c..48b37fc 100644
d88f46
--- a/src/subscription_manager/entcertlib.py
d88f46
+++ b/src/subscription_manager/entcertlib.py
d88f46
@@ -273,10 +273,6 @@ class EntCertUpdateAction(object):
d88f46
                                    rogue_count) % rogue_count
d88f46
             self.ent_dir.refresh()
d88f46
 
d88f46
-    def delete_by_serial(self, serial):
d88f46
-        for ent in self.entitlement_dir.list():
d88f46
-            if str(ent.serial == selection['serial']):
d88f46
-                ent.delete()
d88f46
 
d88f46
 class EntitlementCertBundlesInstaller(object):
d88f46
     """Install a list of entitlement cert bundles.
d88f46
diff --git a/src/subscription_manager/gui/mysubstab.py b/src/subscription_manager/gui/mysubstab.py
d88f46
index bdc2622..4eb3e2c 100644
d88f46
--- a/src/subscription_manager/gui/mysubstab.py
d88f46
+++ b/src/subscription_manager/gui/mysubstab.py
d88f46
@@ -25,6 +25,7 @@ from subscription_manager.ga import GdkPixbuf as ga_GdkPixbuf
d88f46
 
d88f46
 from subscription_manager.async import AsyncBind
d88f46
 from subscription_manager.cert_sorter import EntitlementCertStackingGroupSorter
d88f46
+from subscription_manager.entcertlib import EntCertDeleteAction
d88f46
 from subscription_manager import injection as inj
d88f46
 
d88f46
 from subscription_manager.gui import messageWindow, progress
d88f46
@@ -150,8 +151,9 @@ class MySubscriptionsTab(widgets.SubscriptionManagerTab):
d88f46
             self.async_bind.unbind(serial, selection, self._unsubscribe_callback, self._handle_unbind_exception)
d88f46
         else:
d88f46
             # unregistered, just delete the certs directly
d88f46
-            self.backend.entcertlib.delete_by_serial(serial)
d88f46
-            self.backend.cs.force_cert_check()
d88f46
+            action = EntCertDeleteAction(self.entitlement_dir)
d88f46
+            action.perform([serial])
d88f46
+            self.update_subscriptions()
d88f46
 
d88f46
     def unsubscribe_button_clicked(self, widget):
d88f46
         selection = widgets.SelectionWrapper(self.top_view.get_selection(), self.store)
d88f46
diff --git a/src/subscription_manager/managercli.py b/src/subscription_manager/managercli.py
d88f46
index ba1c4d9..1b50b67 100644
d88f46
--- a/src/subscription_manager/managercli.py
d88f46
+++ b/src/subscription_manager/managercli.py
d88f46
@@ -534,8 +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
+            print _("Registering to: %s:%s%s") % \
d88f46
+                (cfg.get("server", "hostname"), cfg.get("server", "port"), cfg.get("server", "prefix"))
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/src/subscription_manager/plugin/ostree/action_invoker.py b/src/subscription_manager/plugin/ostree/action_invoker.py
d88f46
index f604f2f..2889b09 100644
d88f46
--- a/src/subscription_manager/plugin/ostree/action_invoker.py
d88f46
+++ b/src/subscription_manager/plugin/ostree/action_invoker.py
d88f46
@@ -72,19 +72,14 @@ class OstreeContentUpdateActionCommand(object):
d88f46
         # populate config, handle exceptions
d88f46
         self.load_config(ostree_repo_config)
d88f46
 
d88f46
-        report = OstreeContentUpdateActionReport()
d88f46
-
d88f46
         # return the composed set of EntitledContents
d88f46
         entitled_contents = find_content(self.ent_source,
d88f46
                                          content_type=OSTREE_CONTENT_TYPE)
d88f46
 
d88f46
         # update repo configs
d88f46
-        updates = self.update_config(ostree_repo_config,
d88f46
+        report = self.update_config(ostree_repo_config,
d88f46
                                      contents=entitled_contents)
d88f46
 
d88f46
-        report.orig_remotes = list(updates.orig.remotes)
d88f46
-        report.remote_updates = list(updates.new.remotes)
d88f46
-
d88f46
         # reload the new config, so we have fresh remotes, etc
d88f46
         self.load_config(ostree_repo_config)
d88f46
 
d88f46
@@ -98,15 +93,27 @@ class OstreeContentUpdateActionCommand(object):
d88f46
     def update_config(self, ostree_config, contents):
d88f46
         """Update the remotes configured in a OstreeConfig."""
d88f46
 
d88f46
+        report = OstreeContentUpdateActionReport()
d88f46
+
d88f46
         updates_builder = \
d88f46
             model.OstreeConfigUpdatesBuilder(ostree_config,
d88f46
                                              contents=contents)
d88f46
         updates = updates_builder.build()
d88f46
 
d88f46
+        for remote in updates.orig.remotes:
d88f46
+            if remote in updates.new.remotes:
d88f46
+                report.remote_updates.append(remote)
d88f46
+            else:
d88f46
+                report.remote_deleted.append(remote)
d88f46
+
d88f46
+        for remote in updates.new.remotes:
d88f46
+            if remote not in updates.orig.remotes:
d88f46
+                report.remote_added.append(remote)
d88f46
+
d88f46
         updates.apply()
d88f46
         updates.save()
d88f46
 
d88f46
-        return updates
d88f46
+        return report
d88f46
 
d88f46
     def load_config(self, ostree_config):
d88f46
         try:
d88f46
@@ -147,7 +154,7 @@ class OstreeContentUpdateActionReport(certlib.ActionReport):
d88f46
         s.append(_("Updates:"))
d88f46
         s.append(self._format_remotes(self.remote_updates))
d88f46
         s.append(_("Added:"))
d88f46
-        s.append(self._format_remotes(self.remote_updates))
d88f46
+        s.append(self._format_remotes(self.remote_added))
d88f46
         s.append(_("Deleted:"))
d88f46
-        s.append(self._format_remotes(self.orig_remotes))
d88f46
+        s.append(self._format_remotes(self.remote_deleted))
d88f46
         return '\n'.join(s)
d88f46
diff --git a/subscription-manager.spec b/subscription-manager.spec
d88f46
index c45672a..80bcf70 100644
d88f46
--- a/subscription-manager.spec
d88f46
+++ b/subscription-manager.spec
d88f46
@@ -49,7 +49,7 @@
d88f46
 
d88f46
 Name: subscription-manager
d88f46
 Version: 1.15.9
d88f46
-Release: 5%{?dist}
d88f46
+Release: 6%{?dist}
d88f46
 Summary: Tools and libraries for subscription and repository management
d88f46
 Group:   System Environment/Base
d88f46
 License: GPLv2
d88f46
@@ -123,8 +123,6 @@ platform.
d88f46
 Summary: A plugin for handling OSTree content.
d88f46
 Group: System Environment/Base
d88f46
 
d88f46
-# ostree package also includes the gobject info for pygobject
d88f46
-Requires: ostree
d88f46
 Requires: pygobject3-base
d88f46
 # plugin needs a slightly newer version of python-iniparse for 'tidy'
d88f46
 Requires:  python-iniparse >= 0.4
d88f46
@@ -544,6 +542,16 @@ fi
d88f46
 %endif
d88f46
 
d88f46
 %changelog
d88f46
+* Fri Aug 14 2015 Chris Rog <crog@redhat.com> 1.15.9-6
d88f46
+- 1141128: Subscriptions need refresh after imported cert removed
d88f46
+  (wpoteat@redhat.com)
d88f46
+- 1185958: Remove ostree plugins req on ostree (alikins@redhat.com)
d88f46
+- 1150150: Ostree update report should log updates in proper section
d88f46
+  (wpoteat@redhat.com)
d88f46
+- 1251610: Port and prefix were reversed in connection URL statement
d88f46
+  (wpoteat@redhat.com)
d88f46
+- 1141128: Clean up and correct for style (wpoteat@redhat.com)
d88f46
+
d88f46
 * Wed Aug 12 2015 Chris Rog <crog@redhat.com> 1.15.9-5
d88f46
 - 1141128: Imported certificate in detatched scenario not getting deleted
d88f46
   (wpoteat@redhat.com)