Software Properties

Merge lp:~seb128/software-properties/security-update-tweaks into lp:software-properties

  1. security-update-tweaks
  2. Merge into main
Proposed by Sebastien Bacher on 2016-03-16
Status: Merged
Merged at revision: 956
Proposed branch: lp:~seb128/software-properties/security-update-tweaks
Merge into: lp:software-properties
Diff against target: 73 lines (+22/-4)
4 files modified
data/gtkbuilder/main.ui (+1/-0)
debian/changelog (+16/-0)
debian/control (+4/-3)
softwareproperties/SoftwareProperties.py (+1/-1)
To merge this branch: bzr merge lp:~seb128/software-properties/security-update-tweaks
Reviewer Review Type Date Requested Status
Michael Vogt 2016-03-16 Approve on 2016-03-16
Review via email: mp+289151@code.launchpad.net

Description of the Change

  * data/gtkbuilder/main.ui:
    - let the new label wrap when needed
  * softwareproperties/SoftwareProperties.py:
    - security upload autoinstallation doesn't require autodownload to
      be on, but check that unattended-upgrade is installed instead

  [ Dustin Kirkland ]
  * debian/control: LP: #831487
    - make unattended-upgrades a 'recommends', rather than a depends,
      such that it can be easily removed, without removing a bunch of
      other useful stuff

To post a comment you must log in.
Michael Vogt (mvo) wrote :

looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/gtkbuilder/main.ui'
2--- data/gtkbuilder/main.ui 2016-03-01 18:53:11 +0000
3+++ data/gtkbuilder/main.ui 2016-03-16 09:24:14 +0000
4@@ -1090,6 +1090,7 @@
5 <property name="label" translatable="yes">Proposed updates are only for testing updates and providing development feedback. Enabling this may introduce instability.</property>
6 <property name="use_markup">True</property>
7 <property name="wrap">True</property>
8+ <property name="max-width-chars">110</property>
9 </object>
10 </child>
11 </object>
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2016-03-01 18:53:11 +0000
15+++ debian/changelog 2016-03-16 09:24:14 +0000
16@@ -1,3 +1,19 @@
17+software-properties (0.96.19) xenial; urgency=medium
18+
19+ * data/gtkbuilder/main.ui:
20+ - let the new label wrap when needed
21+ * softwareproperties/SoftwareProperties.py:
22+ - security upload autoinstallation doesn't require autodownload to
23+ be on, but check that unattended-upgrade is installed instead
24+
25+ [ Dustin Kirkland ]
26+ * debian/control: LP: #831487
27+ - make unattended-upgrades a 'recommends', rather than a depends,
28+ such that it can be easily removed, without removing a bunch of
29+ other useful stuff
30+
31+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 16 Mar 2016 10:04:11 +0100
32+
33 software-properties (0.96.18) xenial; urgency=medium
34
35 * Create a new tab for developer options and move the proposed source to it.
36
37=== modified file 'debian/control'
38--- debian/control 2015-08-20 20:58:20 +0000
39+++ debian/control 2016-03-16 09:24:14 +0000
40@@ -20,8 +20,8 @@
41 Section: python
42 Architecture: all
43 Depends: ${python:Depends}, ${misc:Depends}, python, python-apt (>=
44- 0.6.20ubuntu16), python-pycurl, lsb-release,
45- unattended-upgrades, iso-codes
46+ 0.6.20ubuntu16), python-pycurl, lsb-release, iso-codes
47+Recommends: unattended-upgrades
48 Description: manage the repositories that you install software from
49 This software provides an abstraction of the used apt repositories.
50 It allows you to easily manage your distribution and independent software
51@@ -31,7 +31,8 @@
52 Section: python
53 Architecture: all
54 Depends: ${python3:Depends}, ${misc:Depends}, python3, python3-apt (>=
55- 0.6.20ubuntu16), python3-pycurl, lsb-release, unattended-upgrades, iso-codes
56+ 0.6.20ubuntu16), python3-pycurl, lsb-release, iso-codes
57+Recommends: unattended-upgrades
58 Description: manage the repositories that you install software from
59 This software provides an abstraction of the used apt repositories.
60 It allows you to easily manage your distribution and independent software
61
62=== modified file 'softwareproperties/SoftwareProperties.py'
63--- softwareproperties/SoftwareProperties.py 2015-06-05 13:05:08 +0000
64+++ softwareproperties/SoftwareProperties.py 2016-03-16 09:24:14 +0000
65@@ -147,7 +147,7 @@
66 if apt_pkg.config.find_i(softwareproperties.CONF_MAP["autoupdate"]) > 0:
67 # Autodownload
68 if apt_pkg.config.find_i(softwareproperties.CONF_MAP["unattended"]) == 1\
69- and apt_pkg.config.find_i(softwareproperties.CONF_MAP["autodownload"]) == 1 :
70+ and os.path.exists("/usr/bin/unattended-upgrade"):
71 return softwareproperties.UPDATE_INST_SEC
72 elif apt_pkg.config.find_i(softwareproperties.CONF_MAP["autodownload"]) == 1 and \
73 apt_pkg.config.find_i(softwareproperties.CONF_MAP["unattended"]) == 0:

Subscribers

People subscribed via source and target branches

to status/vote changes: