diff options
| author | Brent Baude <bbaude@redhat.com> | 2016-10-27 09:49:06 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-22 13:22:39 -0500 |
| commit | edd94ebff613fd99768d9287b12d72a9409ae6bc (patch) | |
| tree | 93c4c209318c91ee9a259c9529395c39ea9cfb9c | |
| parent | de07968cb546347ae06c43a58e72588bd4c2f569 (diff) | |
| download | vyos-cloud-init-edd94ebff613fd99768d9287b12d72a9409ae6bc.tar.gz vyos-cloud-init-edd94ebff613fd99768d9287b12d72a9409ae6bc.zip | |
cloudinit/config/cc_rh_subscription.py: Remove repos before adding
A user has pointed out that upon set up of a machine, users typically
remove repos (sometimes all of them) and then add repos in. This does
make sense for a typical user.
| -rw-r--r-- | cloudinit/config/cc_rh_subscription.py | 5 | ||||
| -rw-r--r-- | tests/unittests/test_rh_subscription.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py index d858f65c..bd6b5f8e 100644 --- a/cloudinit/config/cc_rh_subscription.py +++ b/cloudinit/config/cc_rh_subscription.py @@ -421,11 +421,12 @@ class SubscriptionManager(object): "because it is not enabled".format(fail)) cmd = ['repos'] - if len(enable_list) > 0: - cmd.extend(enable_list) if len(disable_list) > 0: cmd.extend(disable_list) + if len(enable_list) > 0: + cmd.extend(enable_list) + try: self._sub_man_cli(cmd) except util.ProcessExecutionError as e: diff --git a/tests/unittests/test_rh_subscription.py b/tests/unittests/test_rh_subscription.py index 891dbe77..79623872 100644 --- a/tests/unittests/test_rh_subscription.py +++ b/tests/unittests/test_rh_subscription.py @@ -83,8 +83,8 @@ class GoodTests(TestCase): ''' call_lists = [] call_lists.append(['attach', '--pool=pool1', '--pool=pool3']) - call_lists.append(['repos', '--enable=repo2', '--enable=repo3', - '--disable=repo5']) + call_lists.append(['repos', '--disable=repo5', '--enable=repo2', + '--enable=repo3']) call_lists.append(['attach', '--auto', '--servicelevel=self-support']) self.SM.log_success = mock.MagicMock() reg = "The system has been registered with ID:" \ |