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

Rename qubes.xdg python module to qubesxdg

Browse Source 
Do not interfere with 'qubes' module.

QubesOS/qubes-issues#1813
This commit is contained in:
Marek Marczykowski-Górecki 2016-03-14 16:06:52 +01:00
parent 1a601ddbe9
commit 76e12cae2d
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -249,9 +249,9 @@ install-common:
mkdir -p $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/ mkdir -p $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/
ifeq ($(shell lsb_release -is), Debian) ifeq ($(shell lsb_release -is), Debian)
install -m 0644 misc/xdg.py $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/ install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
else else
install -m 0644 misc/py2/xdg.py* $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/ install -m 0644 misc/py2/qubesxdg.py* $(DESTDIR)/$(PYTHON2_SITELIB)/
endif endif
install -d $(DESTDIR)/mnt/removable install -d $(DESTDIR)/mnt/removable

2
misc/Makefile
View File

@ -23,7 +23,7 @@ python2:
python3: python3:
rm -rf py3 rm -rf py3
mkdir -p py3 mkdir -p py3
cp dnf-qubes-hooks.py xdg.py py3/ cp dnf-qubes-hooks.py qubesxdg.py py3/
python3 -m compileall py3 python3 -m compileall py3
python3 -O -m compileall py3 python3 -O -m compileall py3

2
misc/qubes-desktop-run
View File

@ -1,6 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
from qubes.xdg import launch from qubesxdg import launch
import sys import sys
if __name__ == '__main__': if __name__ == '__main__':

4
misc/qubes-session-autostart
View File

@ -25,7 +25,7 @@ import subprocess
import sys import sys
from xdg.DesktopEntry import DesktopEntry from xdg.DesktopEntry import DesktopEntry
from qubes.xdg import launch from qubesxdg import launch
import xdg.BaseDirectory import xdg.BaseDirectory
import os import os
@ -86,4 +86,4 @@ def main():
process_autostart(sys.argv[1:]) process_autostart(sys.argv[1:])
if __name__ == '__main__': if __name__ == '__main__':
main() main()

0
misc/xdg.py → misc/qubesxdg.py
View File

2
rpm_spec/core-vm.spec
View File

@ -424,7 +424,7 @@ rm -f %{name}-%{version}
/usr/lib/qubes/upgrades-status-notify /usr/lib/qubes/upgrades-status-notify
/usr/lib/yum-plugins/yum-qubes-hooks.py* /usr/lib/yum-plugins/yum-qubes-hooks.py*
/usr/lib/dracut/dracut.conf.d/30-qubes.conf /usr/lib/dracut/dracut.conf.d/30-qubes.conf
/usr/lib64/python2.7/site-packages/qubes/xdg.py* /usr/lib/python2.7/site-packages/qubesxdg.py*
/usr/sbin/qubes-firewall /usr/sbin/qubes-firewall
/usr/sbin/qubes-netwatcher /usr/sbin/qubes-netwatcher
/usr/share/qubes/serial.conf /usr/share/qubes/serial.conf