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
=== modified file 'conf/utah/default-preseed.cfg'
--- conf/utah/default-preseed.cfg 2013-02-26 08:36:36 +0000
+++ conf/utah/default-preseed.cfg 2017-08-30 22:01:21 +0000
@@ -34,6 +34,6 @@
34d-i passwd/username string utah34d-i passwd/username string utah
35d-i passwd/user-password password !ubuntu12335d-i passwd/user-password password !ubuntu123
36d-i passwd/user-password-again password !ubuntu12336d-i passwd/user-password-again password !ubuntu123
37d-i pkgsel/include string openssh-server python-yaml bzr git gdebi-core37d-i pkgsel/include string openssh-server python-yaml bzr git
38#need this for non-desktop38#need this for non-desktop
39d-i finish-install/reboot_in_progress note39d-i finish-install/reboot_in_progress note
4040
=== modified file 'templates/install-deb-command.jinja2'
--- templates/install-deb-command.jinja2 2013-02-27 11:10:59 +0000
+++ templates/install-deb-command.jinja2 2017-08-30 22:01:21 +0000
@@ -1,3 +1,5 @@
1{% from "check-locks-command.jinja2" import check_locks_command -%}1{% from "check-locks-command.jinja2" import check_locks_command -%}
2{{ check_locks_command() }}2{{ check_locks_command() }}
3DEBIAN_FRONTEND=noninteractive gdebi -n -q {{deb}}3DEBIAN_FRONTEND=noninteractive dpkg --install {{deb}}
4DEBIAN_FRONTEND=noninteractive apt-get update
5DEBIAN_FRONTEND=noninteractive apt-get --option=Dpkg::Options::=--force-confold --option=Dpkg::options::=--force-unsafe-io --assume-yes --quiet install --fix-broken
46
=== modified file 'utah/config.py'
--- utah/config.py 2017-07-06 18:03:17 +0000
+++ utah/config.py 2017-08-30 22:01:21 +0000
@@ -183,7 +183,7 @@
183 'description': 'Packages to install on system',183 'description': 'Packages to install on system',
184 'type': 'array',184 'type': 'array',
185 'items': {'type': 'string'},185 'items': {'type': 'string'},
186 'default': ['openssh-server', 'gdebi-core'],186 'default': ['openssh-server'],
187 },187 },
188 'installtimeout': {188 'installtimeout': {
189 'description': 'Time limit for overall install process',189 'description': 'Time limit for overall install process',

Subscribers

People subscribed via source and target branches

to all changes: