[lorax] Use /usr/bin/python2 in scripts
by Brian C. Lane
New packaging guidelines:
https://fedoraproject.org/wiki/Packaging:Python#Multiple_Python_Runtimes
https://fedorahosted.org/fpc/ticket/327#comment:9
---
setup.py | 2 +-
src/bin/image-minimizer | 2 +-
src/sbin/livemedia-creator | 2 +-
src/sbin/lorax | 2 +-
src/sbin/mkefiboot | 2 +-
utils/test-parse-template | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/setup.py b/setup.py
index 5f889ff..791ffb8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
from distutils.core import setup
import os
diff --git a/src/bin/image-minimizer b/src/bin/image-minimizer
index e46f976..42f8077 100755
--- a/src/bin/image-minimizer
+++ b/src/bin/image-minimizer
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# image-minimizer: removes files and packages on the filesystem
#
diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator
index 21c66d2..fa1beaf 100755
--- a/src/sbin/livemedia-creator
+++ b/src/sbin/livemedia-creator
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Live Media Creator
#
diff --git a/src/sbin/lorax b/src/sbin/lorax
index 9204f7b..ce25a87 100755
--- a/src/sbin/lorax
+++ b/src/sbin/lorax
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# lorax
#
diff --git a/src/sbin/mkefiboot b/src/sbin/mkefiboot
index de04704..38a4ce0 100755
--- a/src/sbin/mkefiboot
+++ b/src/sbin/mkefiboot
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# mkefiboot - a tool to make EFI boot images
#
# Copyright (C) 2011-2014 Red Hat, Inc.
diff --git a/utils/test-parse-template b/utils/test-parse-template
index 54c59aa..796d770 100755
--- a/utils/test-parse-template
+++ b/utils/test-parse-template
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# test-parse-template - parse and print (but don't execute!) a Lorax Template.
# Copyright (C) 2011 Red Hat, Inc.
#
--
2.1.0
9 years, 3 months
[rhel6-branch] Make sure new freebl libs are part of initrd. (#1183134)
by Samantha N. Bueno
Resolves: rhbz#1183134
---
scripts/mk-images | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/mk-images b/scripts/mk-images
index 2749c41..25058e8 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -957,7 +957,7 @@ EOF
ln -sf killall5 $MBD_DIR/sbin/pidof
# Indirect dependencies
- for nsslib in freebl3 softokn3 nssdbm3 ; do
+ for nsslib in freeblpriv3 freebl3 softokn3 nssdbm3 ; do
if [ -f $IMGPATH/$LIBDIR/lib$nsslib.so ]; then
install -m 755 $IMGPATH/$LIBDIR/lib$nsslib.so $MBD_DIR/$LIBDIR/
elif [ -f $IMGPATH/usr/$LIBDIR/lib$nsslib.so ]; then
--
1.9.3
9 years, 3 months
[initial-setup][master][PATCH] Use /usr/bin/python2
by Martin Kolman
Comply with the new packaging guidelines:
https://fedoraproject.org/wiki/Packaging:Python#Multiple_Python_Runtimes
https://fedorahosted.org/fpc/ticket/327#comment:9
Signed-off-by: Martin Kolman <mkolman(a)redhat.com>
---
setup.py | 2 +-
tests/pylint/runpylint.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
index 978b9fd..7252c30 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# Setup file for initial-setup
#
# Copyright (C) 2012 Red Hat, Inc.
diff --git a/tests/pylint/runpylint.sh b/tests/pylint/runpylint.sh
index 18200bf..f410e26 100755
--- a/tests/pylint/runpylint.sh
+++ b/tests/pylint/runpylint.sh
@@ -92,10 +92,10 @@ fi
# run pylint one file / module at a time, otherwise it sometimes gets
# confused
if [ -z "$FILES" ]; then
- # Test any file that either ends in .py or contains #!/usr/bin/python in
+ # Test any file that either ends in .py or contains #!/usr/bin/python2 in
# the first line. Scan everything except old_tests
FILES=$(findtestfiles \( -name '*.py' -o \
- -exec /bin/sh -c "head -1 {} | grep -q '#!/usr/bin/python'" \; \) -print | \
+ -exec /bin/sh -c "head -1 {} | grep -q '#!/usr/bin/python2'" \; \) -print | \
egrep -v '(|/)doc/conf.py')
fi
--
2.1.0
9 years, 3 months
[PATCH] Use /usr/bin/python2 in scripts
by Brian C. Lane
New packaging guidelines:
https://fedoraproject.org/wiki/Packaging:Python#Multiple_Python_Runtimes
https://fedorahosted.org/fpc/ticket/327#comment:9
May as well be ready for python3 as the default.
---
anaconda | 2 +-
data/command-stubs/list-harddrives-stub | 2 +-
dracut/driver-updates | 2 +-
dracut/parse-kickstart | 2 +-
dracut/python-deps | 2 +-
old_tests/pyanaconda_test/backend_test.py | 2 +-
old_tests/pyanaconda_test/desktop_test.py | 2 +-
old_tests/pyanaconda_test/flags_test.py | 2 +-
old_tests/pyanaconda_test/image_test.py | 2 +-
old_tests/pyanaconda_test/network_test.py | 2 +-
old_tests/pyanaconda_test/packages_test.py | 2 +-
old_tests/pyanaconda_test/packaging_test.py | 2 +-
old_tests/pyanaconda_test/partintfhelpers_test.py | 2 +-
old_tests/pyanaconda_test/product_test.py | 2 +-
old_tests/pyanaconda_test/rescue_test.py | 2 +-
old_tests/pyanaconda_test/security_test.py | 2 +-
old_tests/pyanaconda_test/simpleconfig_test.py | 2 +-
old_tests/pyanaconda_test/timezone_test.py | 2 +-
old_tests/pyanaconda_test/users_test.py | 2 +-
old_tests/pyanaconda_test/vnc_test.py | 2 +-
scripts/anaconda-cleanup | 2 +-
scripts/anaconda-yum | 2 +-
scripts/analog | 2 +-
scripts/githooks/pre-commit | 2 +-
scripts/instperf | 2 +-
scripts/makebumpver | 2 +-
scripts/makeupdates | 2 +-
tests/gettext/gettext_potfiles.py | 2 +-
tests/gettext/style_guide.py | 2 +-
tests/glade/accelerators/check_accelerators.py | 2 +-
tests/glade/format_string/check_format_string.py | 2 +-
tests/glade/icons/check_icons.py | 2 +-
tests/glade/markup/check_markup.py | 2 +-
tests/glade/pw_visibility/check_pw_visibility.py | 2 +-
tests/glade/validity/check_glade_validity.py | 2 +-
tests/glade/viewport/check_viewport.py | 2 +-
tests/gui/inside/__init__.py | 2 +-
tests/gui/outside/__init__.py | 2 +-
tests/gui/outside/test_reclaim.py | 2 +-
tests/gui/outside/test_simplelivecd.py | 2 +-
tests/pyanaconda_tests/ks_version_test.py | 2 +-
tests/regex_tests/groupparse_test.py | 2 +-
tests/regex_tests/hostname_test.py | 2 +-
tests/regex_tests/repo_name_test.py | 2 +-
tests/regex_tests/username_test.py | 2 +-
tests/storage/cases/__init__.py | 2 +-
tests/storage/cases/bz1014545.py | 2 +-
tests/storage/cases/bz1067707.py | 2 +-
tests/storage/cases/reuse.py | 2 +-
tests/storage/run_storage_tests.py | 2 +-
utils/handle-sshpw | 2 +-
51 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/anaconda b/anaconda
index cd28667..667ade9 100755
--- a/anaconda
+++ b/anaconda
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# anaconda: The Red Hat Linux Installation program
#
diff --git a/data/command-stubs/list-harddrives-stub b/data/command-stubs/list-harddrives-stub
index ae5e6b9..3c52d35 100755
--- a/data/command-stubs/list-harddrives-stub
+++ b/data/command-stubs/list-harddrives-stub
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# scan system for harddrives and output device name/size
#
diff --git a/dracut/driver-updates b/dracut/driver-updates
index 7554b4e..24a18ba 100755
--- a/dracut/driver-updates
+++ b/dracut/driver-updates
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2013 by Red Hat, Inc. All rights reserved.
#
diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
index 412ac6a..9a62df2 100755
--- a/dracut/parse-kickstart
+++ b/dracut/parse-kickstart
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#vim: set fileencoding=utf8
# parse-kickstart - read a kickstart file and emit equivalent dracut boot args
#
diff --git a/dracut/python-deps b/dracut/python-deps
index ba0bb1f..05a48e3 100755
--- a/dracut/python-deps
+++ b/dracut/python-deps
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# python-deps - find the dependencies of a given python script.
import copy
diff --git a/old_tests/pyanaconda_test/backend_test.py b/old_tests/pyanaconda_test/backend_test.py
index b09ee69..624c53a 100644
--- a/old_tests/pyanaconda_test/backend_test.py
+++ b/old_tests/pyanaconda_test/backend_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
diff --git a/old_tests/pyanaconda_test/desktop_test.py b/old_tests/pyanaconda_test/desktop_test.py
index 2078c9a..72a1a47 100644
--- a/old_tests/pyanaconda_test/desktop_test.py
+++ b/old_tests/pyanaconda_test/desktop_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
import sys
diff --git a/old_tests/pyanaconda_test/flags_test.py b/old_tests/pyanaconda_test/flags_test.py
index e4046d5..9487b13 100644
--- a/old_tests/pyanaconda_test/flags_test.py
+++ b/old_tests/pyanaconda_test/flags_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# Test Bug 500198
diff --git a/old_tests/pyanaconda_test/image_test.py b/old_tests/pyanaconda_test/image_test.py
index f3faeac..dd5cb47 100644
--- a/old_tests/pyanaconda_test/image_test.py
+++ b/old_tests/pyanaconda_test/image_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
import sys
diff --git a/old_tests/pyanaconda_test/network_test.py b/old_tests/pyanaconda_test/network_test.py
index 756c11d..d279fef 100644
--- a/old_tests/pyanaconda_test/network_test.py
+++ b/old_tests/pyanaconda_test/network_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
import os
diff --git a/old_tests/pyanaconda_test/packages_test.py b/old_tests/pyanaconda_test/packages_test.py
index 18de7ab..e31c2d2 100644
--- a/old_tests/pyanaconda_test/packages_test.py
+++ b/old_tests/pyanaconda_test/packages_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
diff --git a/old_tests/pyanaconda_test/packaging_test.py b/old_tests/pyanaconda_test/packaging_test.py
index 99bc871..18c6ca1 100644
--- a/old_tests/pyanaconda_test/packaging_test.py
+++ b/old_tests/pyanaconda_test/packaging_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
diff --git a/old_tests/pyanaconda_test/partintfhelpers_test.py b/old_tests/pyanaconda_test/partintfhelpers_test.py
index efc0680..2275e32 100644
--- a/old_tests/pyanaconda_test/partintfhelpers_test.py
+++ b/old_tests/pyanaconda_test/partintfhelpers_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
diff --git a/old_tests/pyanaconda_test/product_test.py b/old_tests/pyanaconda_test/product_test.py
index 9b0d864..10a6df6 100644
--- a/old_tests/pyanaconda_test/product_test.py
+++ b/old_tests/pyanaconda_test/product_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
import sys
diff --git a/old_tests/pyanaconda_test/rescue_test.py b/old_tests/pyanaconda_test/rescue_test.py
index b93f75e..611b7b4 100644
--- a/old_tests/pyanaconda_test/rescue_test.py
+++ b/old_tests/pyanaconda_test/rescue_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
diff --git a/old_tests/pyanaconda_test/security_test.py b/old_tests/pyanaconda_test/security_test.py
index 33b94c1..4d68ddf 100644
--- a/old_tests/pyanaconda_test/security_test.py
+++ b/old_tests/pyanaconda_test/security_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
import sys
diff --git a/old_tests/pyanaconda_test/simpleconfig_test.py b/old_tests/pyanaconda_test/simpleconfig_test.py
index 265ed88..5c32092 100644
--- a/old_tests/pyanaconda_test/simpleconfig_test.py
+++ b/old_tests/pyanaconda_test/simpleconfig_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
import os
diff --git a/old_tests/pyanaconda_test/timezone_test.py b/old_tests/pyanaconda_test/timezone_test.py
index a53f292..4b21128 100644
--- a/old_tests/pyanaconda_test/timezone_test.py
+++ b/old_tests/pyanaconda_test/timezone_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
import sys
diff --git a/old_tests/pyanaconda_test/users_test.py b/old_tests/pyanaconda_test/users_test.py
index c457ef7..2bb959f 100644
--- a/old_tests/pyanaconda_test/users_test.py
+++ b/old_tests/pyanaconda_test/users_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
import sys
diff --git a/old_tests/pyanaconda_test/vnc_test.py b/old_tests/pyanaconda_test/vnc_test.py
index 80cc527..6cf7fde 100644
--- a/old_tests/pyanaconda_test/vnc_test.py
+++ b/old_tests/pyanaconda_test/vnc_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import mock
import os
diff --git a/scripts/anaconda-cleanup b/scripts/anaconda-cleanup
index 8664685..5869cc1 100755
--- a/scripts/anaconda-cleanup
+++ b/scripts/anaconda-cleanup
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
"""
always:
- unmount everything under /mnt/sysimage
diff --git a/scripts/anaconda-yum b/scripts/anaconda-yum
index 82d7203..23c0460 100755
--- a/scripts/anaconda-yum
+++ b/scripts/anaconda-yum
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# pylint: disable=bad-preconf-access
#
# Copyright (C) 2013 Red Hat, Inc.
diff --git a/scripts/analog b/scripts/analog
index eb1962e..045d4cb 100755
--- a/scripts/analog
+++ b/scripts/analog
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python2
#
# analog: Remote logging manager for the Red Hat Installer
#
diff --git a/scripts/githooks/pre-commit b/scripts/githooks/pre-commit
index 82dccb4..257155f 100755
--- a/scripts/githooks/pre-commit
+++ b/scripts/githooks/pre-commit
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
""" Run the Anaconda pylint tests on the files changed in this commit
Set NOPYLINT env variable to skip this. eg. NOPYLINT= git commit
diff --git a/scripts/instperf b/scripts/instperf
index daa91a7..a4fe28a 100755
--- a/scripts/instperf
+++ b/scripts/instperf
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import logging
from subprocess import Popen, PIPE
diff --git a/scripts/makebumpver b/scripts/makebumpver
index c1483c9..4ec6c07 100755
--- a/scripts/makebumpver
+++ b/scripts/makebumpver
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# makebumpver - Increment version number and add in RPM spec file changelog
# block. Ensures rhel*-branch commits reference RHEL bugs.
diff --git a/scripts/makeupdates b/scripts/makeupdates
index ab420e3..70a0794 100755
--- a/scripts/makeupdates
+++ b/scripts/makeupdates
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# makeupdates - Generate an updates.img containing changes since the last
# tag, but only changes to the main anaconda runtime.
diff --git a/tests/gettext/gettext_potfiles.py b/tests/gettext/gettext_potfiles.py
index 5d80308..05c5ec9 100755
--- a/tests/gettext/gettext_potfiles.py
+++ b/tests/gettext/gettext_potfiles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import os, sys, subprocess
diff --git a/tests/gettext/style_guide.py b/tests/gettext/style_guide.py
index 4b6a9c1..f41369b 100755
--- a/tests/gettext/style_guide.py
+++ b/tests/gettext/style_guide.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/glade/accelerators/check_accelerators.py b/tests/glade/accelerators/check_accelerators.py
index 75f478a..ec44d36 100755
--- a/tests/glade/accelerators/check_accelerators.py
+++ b/tests/glade/accelerators/check_accelerators.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2013 Red Hat, Inc.
#
diff --git a/tests/glade/format_string/check_format_string.py b/tests/glade/format_string/check_format_string.py
index 81191e1..ea213eb 100755
--- a/tests/glade/format_string/check_format_string.py
+++ b/tests/glade/format_string/check_format_string.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/glade/icons/check_icons.py b/tests/glade/icons/check_icons.py
index e338ea2..4321a5b 100755
--- a/tests/glade/icons/check_icons.py
+++ b/tests/glade/icons/check_icons.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/glade/markup/check_markup.py b/tests/glade/markup/check_markup.py
index f90e15e..b7619f8 100755
--- a/tests/glade/markup/check_markup.py
+++ b/tests/glade/markup/check_markup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/glade/pw_visibility/check_pw_visibility.py b/tests/glade/pw_visibility/check_pw_visibility.py
index 0e9a99f..6cbe8e2 100755
--- a/tests/glade/pw_visibility/check_pw_visibility.py
+++ b/tests/glade/pw_visibility/check_pw_visibility.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2013 Red Hat, Inc.
#
diff --git a/tests/glade/validity/check_glade_validity.py b/tests/glade/validity/check_glade_validity.py
index 9a2c179..87445ec 100755
--- a/tests/glade/validity/check_glade_validity.py
+++ b/tests/glade/validity/check_glade_validity.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/glade/viewport/check_viewport.py b/tests/glade/viewport/check_viewport.py
index fd75a1d..337d00f 100755
--- a/tests/glade/viewport/check_viewport.py
+++ b/tests/glade/viewport/check_viewport.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/gui/inside/__init__.py b/tests/gui/inside/__init__.py
index f443fd0..ca29684 100644
--- a/tests/gui/inside/__init__.py
+++ b/tests/gui/inside/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/gui/outside/__init__.py b/tests/gui/outside/__init__.py
index dd35178..597314a 100644
--- a/tests/gui/outside/__init__.py
+++ b/tests/gui/outside/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/gui/outside/test_reclaim.py b/tests/gui/outside/test_reclaim.py
index 02c3ec5..af21ffb 100644
--- a/tests/gui/outside/test_reclaim.py
+++ b/tests/gui/outside/test_reclaim.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/gui/outside/test_simplelivecd.py b/tests/gui/outside/test_simplelivecd.py
index 4c07b16..6d333da 100644
--- a/tests/gui/outside/test_simplelivecd.py
+++ b/tests/gui/outside/test_simplelivecd.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/pyanaconda_tests/ks_version_test.py b/tests/pyanaconda_tests/ks_version_test.py
index 84fa384..ce10a89 100644
--- a/tests/pyanaconda_tests/ks_version_test.py
+++ b/tests/pyanaconda_tests/ks_version_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2013 Red Hat, Inc.
#
diff --git a/tests/regex_tests/groupparse_test.py b/tests/regex_tests/groupparse_test.py
index 6d5b793..0d2e6ba 100644
--- a/tests/regex_tests/groupparse_test.py
+++ b/tests/regex_tests/groupparse_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2010-2013 Red Hat, Inc.
#
diff --git a/tests/regex_tests/hostname_test.py b/tests/regex_tests/hostname_test.py
index fa2bfc6..529fbb7 100644
--- a/tests/regex_tests/hostname_test.py
+++ b/tests/regex_tests/hostname_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# vim:set fileencoding=utf-8
#
# Copyright (C) 2014 Red Hat, Inc.
diff --git a/tests/regex_tests/repo_name_test.py b/tests/regex_tests/repo_name_test.py
index 10f55a8..85d9376 100644
--- a/tests/regex_tests/repo_name_test.py
+++ b/tests/regex_tests/repo_name_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# vim:set fileencoding=utf-8
#
# Copyright (C) 2014 Red Hat, Inc.
diff --git a/tests/regex_tests/username_test.py b/tests/regex_tests/username_test.py
index 0c0d5d2..3ac6bd7 100644
--- a/tests/regex_tests/username_test.py
+++ b/tests/regex_tests/username_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# vim:set fileencoding=utf-8
#
# Copyright (C) 2010-2013 Red Hat, Inc.
diff --git a/tests/storage/cases/__init__.py b/tests/storage/cases/__init__.py
index c07a1ea..74b9467 100644
--- a/tests/storage/cases/__init__.py
+++ b/tests/storage/cases/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2013-2014 Red Hat, Inc.
#
diff --git a/tests/storage/cases/bz1014545.py b/tests/storage/cases/bz1014545.py
index 1e652f5..680b604 100644
--- a/tests/storage/cases/bz1014545.py
+++ b/tests/storage/cases/bz1014545.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2013-2014 Red Hat, Inc.
#
diff --git a/tests/storage/cases/bz1067707.py b/tests/storage/cases/bz1067707.py
index 63b5de8..29a13b7 100644
--- a/tests/storage/cases/bz1067707.py
+++ b/tests/storage/cases/bz1067707.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/storage/cases/reuse.py b/tests/storage/cases/reuse.py
index ac02d58..b0007dd 100644
--- a/tests/storage/cases/reuse.py
+++ b/tests/storage/cases/reuse.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (C) 2014 Red Hat, Inc.
#
diff --git a/tests/storage/run_storage_tests.py b/tests/storage/run_storage_tests.py
index 97810f6..be0d199 100755
--- a/tests/storage/run_storage_tests.py
+++ b/tests/storage/run_storage_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import os, sys
diff --git a/utils/handle-sshpw b/utils/handle-sshpw
index 8965572..c60c998 100755
--- a/utils/handle-sshpw
+++ b/utils/handle-sshpw
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
#
# handle-sshpw: Code processing sshpw lines in kickstart files for the
# install environment.
--
2.1.0
9 years, 3 months
[PATCH] Remove the Encoding entry from the .desktop file
by David Shea
Encoding is deprecated, and all localized strings are supposed to be
UTF-8 now, which is what we were saying they are anyway.
---
data/liveinst/liveinst.desktop.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/data/liveinst/liveinst.desktop.in b/data/liveinst/liveinst.desktop.in
index b0ef188..0a30444 100644
--- a/data/liveinst/liveinst.desktop.in
+++ b/data/liveinst/liveinst.desktop.in
@@ -7,6 +7,5 @@ Exec=/usr/bin/liveinst
Terminal=false
Type=Application
Icon=anaconda
-Encoding=UTF-8
StartupNotify=true
NoDisplay=true
--
2.1.0
9 years, 3 months
[PATCH] Remove some stray parenthesis
by David Shea
It's not like python-requrests changed any timed recently, so how this
ever worked at all is a mystery.
---
pyanaconda/packaging/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py
index c6335fa..91343db 100644
--- a/pyanaconda/packaging/__init__.py
+++ b/pyanaconda/packaging/__init__.py
@@ -361,9 +361,9 @@ class Payload(object):
response = None
if response:
- # write the the local treeinfo file
+ # write the local treeinfo file
with open("/tmp/.treeinfo", "w") as f:
- f.write(response.text())
+ f.write(response.text)
# and also return the treeinfo contents as a string
return response.text
--
2.1.0
9 years, 4 months
[rhel6] dracut needs iscsi_firmware cmdline arg (#1185792)
by Brian C. Lane
When there are /sys/firmware/iscsi_boot* files present the system needs
to have the iscsi_firmware cmdline flag set in order to trigger dracut
to run iscsistart
Resolves: rhbz#1185792
---
booty/bootloaderInfo.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
index 73fec05..e63cbeb 100644
--- a/booty/bootloaderInfo.py
+++ b/booty/bootloaderInfo.py
@@ -24,6 +24,7 @@ import shutil
import string
import struct
from copy import copy
+from glob import glob
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
@@ -162,6 +163,11 @@ class KernelArguments:
hwaddr = self.id.network.netdevices[nic].get("HWADDR")
args.add("ifname=%s:%s" % (nic, hwaddr.lower()))
+ # Add iscsi_firmware to trigger dracut running iscsistart
+ # See rhbz#1099603 and rhbz#1185792
+ if len(glob("/sys/firmware/iscsi_boot*")) > 0:
+ args.add("iscsi_firmware")
+
return args
def get(self):
--
2.1.0
9 years, 4 months
[PATCH] Check that package globs install more than just the first package.
by David Shea
---
tests/kickstart_tests/packages-and-groups-1.ks | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tests/kickstart_tests/packages-and-groups-1.ks b/tests/kickstart_tests/packages-and-groups-1.ks
index 24b6c93..a862fbf 100644
--- a/tests/kickstart_tests/packages-and-groups-1.ks
+++ b/tests/kickstart_tests/packages-and-groups-1.ks
@@ -77,6 +77,13 @@ if [[ \$? != 0 ]]; then
shutdown -h now
fi
+# Make sure that more than just emacs and its dependencies were installed.
+count=\$(rpm -qa emacs\* | wc -l)
+if [[ \$count -lt 50 ]]; then
+ echo '*** emacs glob was not fully installed' > /root/RESULT
+ shutdown -h now
+fi
+
# Testing #4 - ibus stuff should not be installed.
rpm -qa ibus\*
if [[ \$? == 0 ]]; then
--
2.1.0
9 years, 4 months
Test 4
by Vratislav Podzimek
--
Vratislav Podzimek
Anaconda Rider | RHCE | Red Hat, Inc. | Brno - Czech Republic
9 years, 4 months