nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrades: Don't change origins pattern list

Browse Source 
unattended-upgrades installs upgrades from ${distro_codename},
label=Debian by default.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
This commit is contained in:
James Valleroy 2018-09-18 20:35:09 -04:00 committed by Joseph Nuthalapati
parent 8c5ea161c7
commit 5df13f7147
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
1 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
actions/upgrades
View File

@ -15,7 +15,6 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
""" """
Configures or runs unattended-upgrades Configures or runs unattended-upgrades
""" """
@ -26,7 +25,6 @@ import re
import subprocess import subprocess
import sys import sys
CONF_FILE = '/etc/apt/apt.conf.d/50unattended-upgrades'
AUTO_CONF_FILE = '/etc/apt/apt.conf.d/20auto-upgrades' AUTO_CONF_FILE = '/etc/apt/apt.conf.d/20auto-upgrades'
LOG_FILE = '/var/log/unattended-upgrades/unattended-upgrades.log' LOG_FILE = '/var/log/unattended-upgrades/unattended-upgrades.log'
@ -50,15 +48,7 @@ def parse_arguments():
def subcommand_run(_): def subcommand_run(_):
"""Run unattended-upgrades""" """Run unattended-upgrades"""
try: try:
setup() subprocess.Popen(['unattended-upgrades', '-v'],
except FileNotFoundError:
print('Error: Could not configure unattended-upgrades.',
file=sys.stderr)
sys.exit(1)
try:
subprocess.Popen(
['unattended-upgrades', '-v'],
stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL, close_fds=True, stderr=subprocess.DEVNULL, close_fds=True,
start_new_session=True) start_new_session=True)
@ -72,8 +62,10 @@ def subcommand_run(_):
def subcommand_check_auto(_): def subcommand_check_auto(_):
"""Check if automatic upgrades are enabled""" """Check if automatic upgrades are enabled"""
arguments = ['apt-config', 'shell', 'UpdateInterval', arguments = [
'APT::Periodic::Update-Package-Lists'] 'apt-config', 'shell', 'UpdateInterval',
'APT::Periodic::Update-Package-Lists'
]
try: try:
output = subprocess.check_output(arguments).decode() output = subprocess.check_output(arguments).decode()
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error:
@ -90,13 +82,6 @@ def subcommand_check_auto(_):
def subcommand_enable_auto(_): def subcommand_enable_auto(_):
"""Enable automatic upgrades""" """Enable automatic upgrades"""
try:
setup()
except FileNotFoundError:
print('Error: Could not configure unattended-upgrades.',
file=sys.stderr)
sys.exit(1)
with open(AUTO_CONF_FILE, 'w') as conffile: with open(AUTO_CONF_FILE, 'w') as conffile:
conffile.write('APT::Periodic::Update-Package-Lists "1";\n') conffile.write('APT::Periodic::Update-Package-Lists "1";\n')
conffile.write('APT::Periodic::Unattended-Upgrade "1";\n') conffile.write('APT::Periodic::Unattended-Upgrade "1";\n')
@ -110,22 +95,6 @@ def subcommand_disable_auto(_):
print('Already disabled.') print('Already disabled.')
def setup():
"""Sets unattended-upgrades config to upgrade any package from Debian."""
with open(CONF_FILE, 'r') as conffile:
lines = conffile.readlines()
for line in lines:
if re.match(r'\s*"o(rigin)?=Debian";', line):
return # already configured
with open(CONF_FILE, 'w') as conffile:
for line in lines:
conffile.write(line)
if re.match(r'\s*Unattended-Upgrade::Origins-Pattern\s+{', line):
conffile.write(' "origin=Debian";\n')
def subcommand_get_log(_): def subcommand_get_log(_):
"""Print the automatic upgrades log.""" """Print the automatic upgrades log."""
try: try: