diff options
| author | Colin Walters <walters@verbum.org> | 2013-10-27 16:41:40 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-10-28 09:15:32 -0400 |
| commit | affccb343a61262cc87af283241c62385c88a681 (patch) | |
| tree | ac1135b0b2d820204de0364dec9b0ba24b897a2c /src/ostree/ot-admin-builtin-upgrade.c | |
| parent | 7ecfbff26e629509e3ae02867b43ee0ef4ed1018 (diff) | |
| download | ostree-affccb343a61262cc87af283241c62385c88a681.tar.gz | |
main: Treat default osname more consistently
The libostree already treats passing NULL for osname as "booted
osname, if any". We should do the same inside the tools. The upgrade
builtin had this logic duplicated there; we should be able to safely
remove it.
https://bugzilla.gnome.org/show_bug.cgi?id=710970
Diffstat (limited to 'src/ostree/ot-admin-builtin-upgrade.c')
| -rw-r--r-- | src/ostree/ot-admin-builtin-upgrade.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c index 3eeb18a9..12495018 100644 --- a/src/ostree/ot-admin-builtin-upgrade.c +++ b/src/ostree/ot-admin-builtin-upgrade.c @@ -70,8 +70,6 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel if (!ot_admin_require_booted_deployment_or_osname (sysroot, opt_osname, cancellable, error)) goto out; - if (!opt_osname) - opt_osname = (char*)ostree_deployment_get_osname (ostree_sysroot_get_booted_deployment (sysroot)); merge_deployment = ostree_sysroot_get_merge_deployment (sysroot, opt_osname); if (merge_deployment == NULL) { |