Merge ~laney/ubiquity:from-user-true into ubiquity:master

Proposed by Iain Lane
Status: Merged
Merged at revision: e7dec86b1a5366fe4293d077be9bc064bbe3c82b
Proposed branch: ~laney/ubiquity:from-user-true
Merge into: ubiquity:master
Diff against target: 30 lines (+4/-4)
1 file modified
ubiquity/install_misc.py (+4/-4)
Reviewer Review Type Date Requested Status
Julian Andres Klode (community) Approve
Ubuntu Installer Team Pending
Review via email: mp+397285@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Julian Andres Klode (juliank) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubiquity/install_misc.py b/ubiquity/install_misc.py
2index e51a97d..2e411a4 100644
3--- a/ubiquity/install_misc.py
4+++ b/ubiquity/install_misc.py
5@@ -531,10 +531,10 @@ def mark_install(cache, to_install):
6 if cachedpkg is None:
7 continue
8 if not cachedpkg.is_installed:
9- cachedpkg.mark_install(auto_fix=False, auto_inst=False, from_user=False)
10+ cachedpkg.mark_install(auto_fix=False, auto_inst=False, from_user=True)
11 elif cachedpkg.is_upgradable:
12 auto = cachedpkg.is_auto_installed
13- cachedpkg.mark_install(auto_fix=False, auto_inst=False, from_user=False)
14+ cachedpkg.mark_install(auto_fix=False, auto_inst=False, from_user=True)
15 cachedpkg.mark_auto(auto)
16
17 for pkg in to_install:
18@@ -542,10 +542,10 @@ def mark_install(cache, to_install):
19 if cachedpkg is None:
20 continue
21 if not cachedpkg.is_installed:
22- cachedpkg.mark_install(auto_fix=False, auto_inst=True, from_user=False)
23+ cachedpkg.mark_install(auto_fix=False, auto_inst=True, from_user=True)
24 elif cachedpkg.is_upgradable:
25 auto = cachedpkg.is_auto_installed
26- cachedpkg.mark_install(auto_fix=False, auto_inst=True, from_user=False)
27+ cachedpkg.mark_install(auto_fix=False, auto_inst=True, from_user=True)
28 cachedpkg.mark_auto(auto)
29
30 if cache.broken_count > 0:

Subscribers

People subscribed via source and target branches