Merge lp:~powersj/utah/remove-gdebi-core into lp:utah

Proposed by Joshua Powers
Status: Merged
Approved by: Jean-Baptiste Lallement
Approved revision: 1109
Merged at revision: 1109
Proposed branch: lp:~powersj/utah/remove-gdebi-core
Merge into: lp:utah
Diff against target: 35 lines (+5/-3)
3 files modified
conf/utah/default-preseed.cfg (+1/-1)
templates/install-deb-command.jinja2 (+3/-1)
utah/config.py (+1/-1)
To merge this branch: bzr merge lp:~powersj/utah/remove-gdebi-core
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Canonical CI Engineering Pending
Review via email: mp+329968@code.launchpad.net

Commit message

Remove dependency on gdebi-core and use apt-get commands.

gdebi-core was pulled from main in artful. Therefore, it can no longer be
installed during an install. It is in universe and requires additional
changes.

LP: #1714066

To post a comment you must log in.
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

Thanks Josh. It looks good to me, even if the logic of using dpkg then apt to fix the deps instead of just apt seems a little bit mysterious but that's utah.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'conf/utah/default-preseed.cfg'
2--- conf/utah/default-preseed.cfg 2013-02-26 08:36:36 +0000
3+++ conf/utah/default-preseed.cfg 2017-08-30 22:01:21 +0000
4@@ -34,6 +34,6 @@
5 d-i passwd/username string utah
6 d-i passwd/user-password password !ubuntu123
7 d-i passwd/user-password-again password !ubuntu123
8-d-i pkgsel/include string openssh-server python-yaml bzr git gdebi-core
9+d-i pkgsel/include string openssh-server python-yaml bzr git
10 #need this for non-desktop
11 d-i finish-install/reboot_in_progress note
12
13=== modified file 'templates/install-deb-command.jinja2'
14--- templates/install-deb-command.jinja2 2013-02-27 11:10:59 +0000
15+++ templates/install-deb-command.jinja2 2017-08-30 22:01:21 +0000
16@@ -1,3 +1,5 @@
17 {% from "check-locks-command.jinja2" import check_locks_command -%}
18 {{ check_locks_command() }}
19-DEBIAN_FRONTEND=noninteractive gdebi -n -q {{deb}}
20+DEBIAN_FRONTEND=noninteractive dpkg --install {{deb}}
21+DEBIAN_FRONTEND=noninteractive apt-get update
22+DEBIAN_FRONTEND=noninteractive apt-get --option=Dpkg::Options::=--force-confold --option=Dpkg::options::=--force-unsafe-io --assume-yes --quiet install --fix-broken
23
24=== modified file 'utah/config.py'
25--- utah/config.py 2017-07-06 18:03:17 +0000
26+++ utah/config.py 2017-08-30 22:01:21 +0000
27@@ -183,7 +183,7 @@
28 'description': 'Packages to install on system',
29 'type': 'array',
30 'items': {'type': 'string'},
31- 'default': ['openssh-server', 'gdebi-core'],
32+ 'default': ['openssh-server'],
33 },
34 'installtimeout': {
35 'description': 'Time limit for overall install process',

Subscribers

People subscribed via source and target branches

to all changes: