Merge lp:~seb128/software-properties/remove-migration-script into lp:software-properties

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 1061
Proposed branch: lp:~seb128/software-properties/remove-migration-script
Merge into: lp:software-properties
Diff against target: 87 lines (+7/-37)
5 files modified
debian/changelog (+6/-0)
debian/control (+0/-1)
debian/rules (+1/-1)
debian/software-properties-gtk.migrations (+0/-1)
tools/migration-scripts/01_migrate_from_keyring (+0/-34)
To merge this branch: bzr merge lp:~seb128/software-properties/remove-migration-script
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+361837@code.launchpad.net

Commit message

Remove the migration script, it was online needed until bionic

Description of the change

Remove the migration script, it was online needed until bionic

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2019-01-15 09:49:00 +0000
+++ debian/changelog 2019-01-16 16:03:22 +0000
@@ -1,3 +1,9 @@
1software-properties (0.96.31) UNRELEASED; urgency=medium
2
3 * Remove the migration script, it was online needed until bionic
4
5 -- Sebastien Bacher <seb128@ubuntu.com> Wed, 16 Jan 2019 17:01:00 +0100
6
1software-properties (0.96.30) disco; urgency=medium7software-properties (0.96.30) disco; urgency=medium
28
3 [ Carlo Vanini ]9 [ Carlo Vanini ]
410
=== modified file 'debian/control'
--- debian/control 2018-07-14 10:32:29 +0000
+++ debian/control 2019-01-16 16:03:22 +0000
@@ -19,7 +19,6 @@
19 python3-all,19 python3-all,
20 python3-distutils-extra,20 python3-distutils-extra,
21 python3-setuptools,21 python3-setuptools,
22 dh-migrations,
23 dh-translations22 dh-translations
24Standards-Version: 3.9.623Standards-Version: 3.9.6
25Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/software-properties/main24Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/software-properties/main
2625
=== modified file 'debian/rules'
--- debian/rules 2018-04-17 11:36:55 +0000
+++ debian/rules 2019-01-16 16:03:22 +0000
@@ -1,7 +1,7 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
22
3%:3%:
4 dh $@ --with python3,translations,migrations --buildsystem=pybuild4 dh $@ --with python3,translations --buildsystem=pybuild
55
6override_dh_auto_test:6override_dh_auto_test:
7 dbus-run-session -- dh_auto_test7 dbus-run-session -- dh_auto_test
88
=== removed file 'debian/software-properties-gtk.migrations'
--- debian/software-properties-gtk.migrations 2018-04-17 11:36:55 +0000
+++ debian/software-properties-gtk.migrations 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1tools/migration-scripts/*
2\ No newline at end of file0\ No newline at end of file
31
=== removed directory 'tools'
=== removed directory 'tools/migration-scripts'
=== removed file 'tools/migration-scripts/01_migrate_from_keyring'
--- tools/migration-scripts/01_migrate_from_keyring 2018-04-17 11:36:55 +0000
+++ tools/migration-scripts/01_migrate_from_keyring 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
1#!/usr/bin/python3
2# -*- coding: utf-8 -*-
3# Copyright (C) 2018 Canonical
4#
5# Authors:
6# Andrea Azzarone <andrea.azzarone@canonical.com>
7#
8# This program is free software; you can redistribute it and/or modify it under
9# the terms of the GNU General Public License as published by the Free Software
10# Foundation; version 3.
11#
12# This program is distributed in the hope that it will be useful, but WITHOUTa
13# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
14# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
15# details.
16#
17# You should have received a copy of the GNU General Public License along with
18# this program; if not, write to the Free Software Foundation, Inc.,
19# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
21import gi
22gi.require_version('Secret', '1')
23from gi.repository import Gio, Secret
24
25SECRETS_SCHEMA = Secret.Schema.new('com.ubuntu.SotwareProperties',
26 Secret.SchemaFlags.NONE,
27 {'key': Secret.SchemaAttributeType.STRING})
28
29account_id = Secret.password_lookup_sync(SECRETS_SCHEMA, {'key': 'account-id'}, None)
30
31if account_id:
32 settings = Gio.Settings.new('com.ubuntu.SoftwareProperties')
33 account_id = settings.set_string('goa-account-id', account_id)
34 Gio.Settings.sync()
35\ No newline at end of file0\ No newline at end of file

Subscribers

People subscribed via source and target branches

to status/vote changes: