Dev commited on 2018-06-17 09:48:36
Showing 1 changed files, with 4 additions and 8 deletions.
| ... | ... |
@@ -136,12 +136,6 @@ module RCM |
| 136 | 136 |
|
| 137 | 137 |
end |
| 138 | 138 |
|
| 139 |
- def self.whachugot # or get_current_state |
|
| 140 |
- @got[PACKAGES] = @pkg_mgr.get_current_state(@wanted[PACKAGES]) |
|
| 141 |
- @got[FILES] = @file_mgr.get_current_state(@wanted[FILES]) |
|
| 142 |
- # @got[SERVICES] = @svc_mgr.get_current_state(@wanted[SERVICES]) |
|
| 143 |
- end |
|
| 144 |
- |
|
| 145 | 139 |
def self.converge_packages |
| 146 | 140 |
# We'll install them in one go (minor optimization) |
| 147 | 141 |
missing_packages = [] |
| ... | ... |
@@ -165,7 +159,6 @@ module RCM |
| 165 | 159 |
end |
| 166 | 160 |
end |
| 167 | 161 |
|
| 168 |
- @logger.debug("Missing packages: #{missing_packages.join(', ')}")
|
|
| 169 | 162 |
@pkg_mgr.install(missing_packages) |
| 170 | 163 |
|
| 171 | 164 |
end |
| ... | ... |
@@ -201,8 +194,11 @@ module RCM |
| 201 | 194 |
def main |
| 202 | 195 |
configure_logger |
| 203 | 196 |
whachuwant |
| 204 |
- whachugot |
|
| 197 |
+ # Installing packages creates file that we want to delete. |
|
| 198 |
+ # So finish managing packages and then deal with files. |
|
| 199 |
+ @got[PACKAGES] = @pkg_mgr.get_current_state(@wanted[PACKAGES]) |
|
| 205 | 200 |
converge_packages |
| 201 |
+ @got[FILES] = @file_mgr.get_current_state(@wanted[FILES]) |
|
| 206 | 202 |
converge_files |
| 207 | 203 |
restart_services_if_needed |
| 208 | 204 |
end |
| 209 | 205 |