[f22-branch 1/1] Force an encoding of utf-8 on liveinst installs (#1217504)

dashea installerbot-noreply at redhat.com
Fri May 1 12:17:50 UTC 2015


From: David Shea <dshea at redhat.com>

This adds a copy of sitecustomize.py to a directory that can be added
to PYTHONPATH, and adds that directory to PYTHONPATH when running
liveinst. This way anaconda do perform early sys changes while not
affecting python globally and not messing up regular imports too badly.

This does not fix unicode problems for all cases (image/dir install are
still affected), but it papers over them for live installs.
---
 anaconda.spec.in       | 4 ++++
 data/liveinst/liveinst | 1 +
 2 files changed, 5 insertions(+)

diff --git a/anaconda.spec.in b/anaconda.spec.in
index ce56390..c5df111 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -237,6 +237,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 
 %ifarch %livearches
 desktop-file-install ---dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/liveinst.desktop
+
+# Add a sitecustomize.py to be loaded by liveinst
+mkdir -p %{buildroot}%{_datadir}/anaconda/site-python
+install -m 0644 pyanaconda/sitecustomize.py %{buildroot}%{_datadir}/anaconda/site-python/
 %endif
 # NOTE: If you see "error: Installed (but unpackaged) file(s) found" that include liveinst files,
 #       check the IS_LIVEINST_ARCH in configure.ac to make sure your architecture is properly defined
diff --git a/data/liveinst/liveinst b/data/liveinst/liveinst
index cbbd5ae..e26619d 100755
--- a/data/liveinst/liveinst
+++ b/data/liveinst/liveinst
@@ -85,6 +85,7 @@ else
 fi
 
 export PATH=/sbin:/usr/sbin:$PATH
+export PYTHONPATH=/usr/share/anaconda/site-python
 
 if [ -x /usr/sbin/getenforce ]; then
     current=$(/usr/sbin/getenforce)


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/05096a31d98de61713f208eb574dca9c1432e93b


More information about the anaconda-patches mailing list