Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: rename 'yum-proxy-setup' feature to 'updates-proxy-setup'

Browse Source 
The 'yum-proxy-setup' is deprecated since R3.0, so finally remove old
name.
But add it to R3.x compatibility layer.
This commit is contained in:
Marek Marczykowski-Górecki 2016-03-07 03:26:59 +01:00 committed by Wojtek Porczyk
parent b6d8c7fb81
commit 9567f7b40b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qubes/ext/r3compatibility.py
View File

@ -229,3 +229,6 @@ class R3Compatibility(qubes.ext.Extension):
# forcefully convert to '0' or '1' # forcefully convert to '0' or '1'
vm.qdb.write('/qubes-service/{}'.format(service), vm.qdb.write('/qubes-service/{}'.format(service),
str(int(bool(value)))) str(int(bool(value))))
if 'updates-proxy-setup' in vm.features.keys():
vm.qdb.write('/qubes-service/{}'.format('yum-proxy-setup'),
str(int(bool(vm.features['updates-proxy-setup']))))

6
qubes/vm/__init__.py
View File

@ -564,13 +564,13 @@ class BaseVM(qubes.PropertyHolder):
os.path.basename(sys.argv[0]), err) os.path.basename(sys.argv[0]), err)
return False return False
# Automatically enable/disable 'yum-proxy-setup' service based on # Automatically enable/disable 'updates-proxy-setup' service based on
# allowYumProxy # allowYumProxy
if conf['allowYumProxy']: if conf['allowYumProxy']:
self.features['yum-proxy-setup'] = '1' self.features['updates-proxy-setup'] = '1'
else: else:
try: try:
del self.features['yum-proxy-setup'] del self.features['updates-proxy-setup']
except KeyError: except KeyError:
pass pass