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

Proposed by Sebastien Bacher on 2019-01-16
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) 2019-01-16 Approve on 2019-01-16
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.
Andrea Azzarone (azzar1) wrote :

LGTM

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches

to status/vote changes: