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

Remove Fedora-comps.xml

Browse Source 
We have now own Qubes-comps.xml, so use it if present.
This commit is contained in:
Marek Marczykowski 2013-03-14 00:55:20 +01:00
parent 0188ee9853
commit 1d8222dbdb
4 changed files with 6 additions and 41278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22238
dom0/misc/Fedora-13-comps.xml
View File

File diff suppressed because it is too large Load Diff

19036
dom0/misc/Fedora-18-comps.xml
View File

File diff suppressed because it is too large Load Diff

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

@ -35,7 +35,7 @@ updates_repodata_dir = updates_dir + "/repodata"
updates_error_file = updates_dir + "/errors" updates_error_file = updates_dir + "/errors"
updates_error_file_handle = None updates_error_file_handle = None
comps_file = '/usr/share/qubes/Fedora-comps.xml' comps_file = None
if os.path.exists('/usr/share/qubes/Qubes-comps.xml'): if os.path.exists('/usr/share/qubes/Qubes-comps.xml'):
comps_file = '/usr/share/qubes/Qubes-comps.xml' comps_file = '/usr/share/qubes/Qubes-comps.xml'
@ -88,7 +88,11 @@ def handle_dom0updates(updatevm):
if updates_error_file_handle is not None: if updates_error_file_handle is not None:
updates_error_file_handle.close() updates_error_file_handle.close()
# After updates received - create repo metadata # After updates received - create repo metadata
subprocess.check_call(["/usr/bin/createrepo", "-g", comps_file, "-q", updates_dir]) createrepo_cmd = ["/usr/bin/createrepo"]
if comps_file:
createrepo_cmd += ["-g", comps_file]
createrepo_cmd += ["-q", updates_dir]
subprocess.check_call(createrepo_cmd)
os.chown(updates_repodata_dir, -1, qubes_gid) os.chown(updates_repodata_dir, -1, qubes_gid)
os.chmod(updates_repodata_dir, 0775) os.chmod(updates_repodata_dir, 0775)
# Clean old cache # Clean old cache

2
rpm_spec/core-dom0.spec
View File

@ -198,7 +198,6 @@ cp misc/qubes-appmenu-select.desktop $RPM_BUILD_ROOT/usr/share/qubes/
cp misc/qubes-start.desktop $RPM_BUILD_ROOT/usr/share/qubes/ cp misc/qubes-start.desktop $RPM_BUILD_ROOT/usr/share/qubes/
cp misc/vm-template.conf $RPM_BUILD_ROOT/usr/share/qubes/ cp misc/vm-template.conf $RPM_BUILD_ROOT/usr/share/qubes/
cp misc/vm-template-hvm.conf $RPM_BUILD_ROOT/usr/share/qubes/ cp misc/vm-template-hvm.conf $RPM_BUILD_ROOT/usr/share/qubes/
cp misc/Fedora-%{fedora}-comps.xml $RPM_BUILD_ROOT/usr/share/qubes/Fedora-comps.xml
mkdir -p $RPM_BUILD_ROOT/usr/bin mkdir -p $RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT/etc/dhclient.d mkdir -p $RPM_BUILD_ROOT/etc/dhclient.d
@ -417,7 +416,6 @@ fi
/usr/share/qubes/qubes-start.desktop /usr/share/qubes/qubes-start.desktop
/usr/share/qubes/vm-template.conf /usr/share/qubes/vm-template.conf
/usr/share/qubes/vm-template-hvm.conf /usr/share/qubes/vm-template-hvm.conf
/usr/share/qubes/Fedora-comps.xml
/etc/sysconfig/iptables /etc/sysconfig/iptables
/etc/sysconfig/ip6tables /etc/sysconfig/ip6tables
/etc/sysconfig/modules/qubes-dom0.modules /etc/sysconfig/modules/qubes-dom0.modules