Skip to content

Commit 2c16fa6

Browse files
authored
Fix failed actions to get reported as "successfully" (#1704)
The conditional `num_packages == 1` clearly reports a success even if the action failed as it does not consider failures. Fix that and add a clear call to action if any failures occurred. Typically, restarting Sublime Text heals every wound.
1 parent dc6badd commit 2c16fa6

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

package_control/package_tasks.py

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -395,14 +395,18 @@ def run_install_tasks(self, tasks, progress=None, unattended=False, package_kind
395395
elif result is None:
396396
package_names.remove(task.package_name)
397397

398-
if num_packages == 1:
399-
message = 'Package {} successfully installed'.format(tasks[0].package_name)
400-
elif num_packages == num_success:
401-
message = 'All {}packages successfully installed'.format(package_kind)
398+
if num_packages == num_success:
399+
if package_kind or num_packages > 1:
400+
message = 'All {}packages successfully installed'.format(package_kind)
401+
else:
402+
message = 'Package {} successfully installed'.format(tasks[0].package_name)
402403
console_write(message)
403404
else:
404-
message = '{} of {} {}packages successfully installed'.format(
405-
num_success, num_packages, package_kind)
405+
message = (
406+
'{} of {} {}packages successfully installed. '
407+
'Restart Sublime Text to attempt to install the remaining ones.'
408+
.format(num_success, num_packages, package_kind)
409+
)
406410
console_write(message)
407411

408412
if progress:
@@ -484,13 +488,18 @@ def run_upgrade_tasks(self, tasks, progress=None, unattended=False):
484488
if package != task.available_name:
485489
disable_packages[self.INSTALL].remove(task.available_name)
486490

487-
if num_packages == 1:
488-
message = 'Package {} successfully upgraded'.format(tasks[0].package_name)
489-
elif num_packages == num_success:
490-
message = 'All packages successfully upgraded'
491+
if num_packages == num_success:
492+
if num_packages > 1:
493+
message = 'All packages successfully upgraded'
494+
else:
495+
message = 'Package {} successfully upgraded'.format(tasks[0].package_name)
491496
console_write(message)
492497
else:
493-
message = '{} of {} packages successfully upgraded'.format(num_success, num_packages)
498+
message = (
499+
'{} of {} packages successfully upgraded. '
500+
'Restart Sublime Text to attempt to upgrade the remaining ones.'
501+
.format(num_success, num_packages)
502+
)
494503
console_write(message)
495504

496505
if progress:

0 commit comments

Comments
 (0)