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

dom0/updates: use Qubes-comps.xml if present

Browse Source
This commit is contained in:
Marek Marczykowski 2013-02-08 22:40:39 +01:00
parent eb5ba60da7
commit df47ae5e77
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom0/qubes_rpc/qubes-receive-updates
View File

@ -35,6 +35,10 @@ updates_repodata_dir = updates_dir + "/repodata"
updates_error_file = updates_dir + "/errors"
updates_error_file_handle = None
comps_file = '/usr/share/qubes/Fedora-comps.xml'
if os.path.exists('/usr/share/qubes/Qubes-comps.xml'):
comps_file = '/usr/share/qubes/Qubes-comps.xml'
package_regex = re.compile(r"^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._+-]{1,128}.rpm$")
gpg_ok_regex = re.compile(r"pgp md5 OK$")
@ -84,7 +88,7 @@ def handle_dom0updates(updatevm):
if updates_error_file_handle is not None:
updates_error_file_handle.close()
# After updates received - create repo metadata
subprocess.check_call(["/usr/bin/createrepo", "-g", "/usr/share/qubes/Fedora-comps.xml", "-q", updates_dir])
subprocess.check_call(["/usr/bin/createrepo", "-g", comps_file, "-q", updates_dir])
os.chown(updates_repodata_dir, -1, qubes_gid)
os.chmod(updates_repodata_dir, 0775)
# Clean old cache