anaconda-patches September 2013

anaconda-patches@lists.fedorahosted.org

17 participants
168 discussions

[PATCH] Allow runpylint.sh to be passed files
by Brian C. Lane 13 Sep '13

13 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> --- tests/pylint/runpylint.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/pylint/runpylint.sh b/tests/pylint/runpylint.sh index 2cf5797..6fe1b6c 100755 --- a/tests/pylint/runpylint.sh +++ b/tests/pylint/runpylint.sh @@ -44,10 +44,11 @@ DISABLED_ERR_OPTIONS="--disable=E1103" DISABLED_WARN_OPTIONS="--disable=W0110,W0141,W0142,W0223,W0403,W0511,W0603,W0604,W0613,W0614" usage () { - echo "usage: `basename $0` [--strict] [--help]" + echo "usage: `basename $0` [--strict] [--help] [files...]" exit $1 } +FILES= while [ $# -gt 0 ]; do case $1 in --strict) @@ -57,8 +58,8 @@ while [ $# -gt 0 ]; do usage 0 ;; *) - echo "Error unknown option: $1" - usage 1 + FILES=$@ + break esac shift done @@ -76,7 +77,10 @@ fi # run pylint one file / module at a time, otherwise it sometimes gets # confused -for i in "${top_srcdir}"/anaconda $(find "${top_srcdir}/pyanaconda" -type f -name '*py' \! -executable); do +if [ -z "$FILES" ]; then + FILES="${top_srcdir}/anaconda $(find "${top_srcdir}/pyanaconda" -type f -name '*py' \! -executable)" +fi +for i in $FILES; do if [ -n "$(echo "$i" | grep 'pyanaconda/packaging/dnfpayload.py$')" ]; then continue fi -- 1.8.3.1

3 3

[PATCH] add pre-commit hook to run pylint
by Brian C. Lane 13 Sep '13

13 Sep '13

From: "Brian C. Lane" <bcl(a)redhat.com> This hook will run the runpylint.sh test on just the files changed in the commit. --- scripts/githooks/README | 14 ++++++++++++++ scripts/githooks/pre-commit | 47 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100755 scripts/githooks/pre-commit diff --git a/scripts/githooks/README b/scripts/githooks/README index a3087a2..92bccd7 100644 --- a/scripts/githooks/README +++ b/scripts/githooks/README @@ -10,3 +10,17 @@ commit-msg also want to create a ~/.rhbzauth file containing two shell variables: RHBZ_USER and RHBZ_PASSWORD to allow automatic login when commiting patches. + +pre-commit + Run the runpylint.sh test on the files changed in the commit. + + To use, copy this script to your .git/hooks directory and + edit the OTHER_MODULES_PATH to point to where you normally have + pykickstart and blivet checked out. Note that if the current + working versions of these differ too much the pylint checks may + fail. + + Set the NOPYLINT= environmental variable while committing to skip + running pylint. eg. + NOPYLINT= git commit -a -m "I didn't break it" + diff --git a/scripts/githooks/pre-commit b/scripts/githooks/pre-commit new file mode 100755 index 0000000..7ab2df7 --- /dev/null +++ b/scripts/githooks/pre-commit @@ -0,0 +1,47 @@ +#!/usr/bin/python +""" Run the Anaconda pylint tests on the files changed in this commit + + Set NOPYLINT env variable to skip this. eg. NOPYLINT= git commit + + +""" +import os +import sys +from subprocess import check_output, CalledProcessError + +OTHER_MODULES_PATH = ".:../blivet/:../pykickstart/" + +if "NOPYLINT" in os.environ: + print "Skipping pre-commit pylint run" + sys.exit(0) + +# run pylint on all the python files changed by this commit +try: + git_files = check_output("git diff-index --cached HEAD", shell=True) +except CalledProcessError: + sys.exit(1) + +pylint_files = [] +# Lines look like: :100755 100755 2cf57974e13a2aae778e28f942a4d44bf6567409 6fe1b6caf32d565b2cdb6d1aee250aaddc6d3a04 M tests/pylint/runpylint.sh +for gf in git_files.splitlines(): + path = gf.split()[-1] + if path == "anaconda" or path.endswith(".py"): + pylint_files.append(path) + +if not pylint_files: + sys.exit(0) +pylint_files = " ".join(pylint_files) + +# Make sure pykickstart and blivet can be found +# Note that if the checked out versions are too far off pylint may fail +env = os.environ.copy() +env["PYTHONPATH"] = OTHER_MODULES_PATH + +print "Running pylint on %s" % pylint_files +try: + check_output("./tests/pylint/runpylint.sh %s" % pylint_files, shell=True, env=env) +except CalledProcessError as e: + print e.output + sys.exit(1) + +sys.exit(0) -- 1.8.3.1

2 1

[PATCH 1/3] DNFPayload: mirrorlist can not be an empty string.
by Ales Kozumplik 13 Sep '13

13 Sep '13

From: Ales Kozumplik <ales(a)redhat.com> --- pyanaconda/packaging/dnfpayload.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py index a9bd59e..4380fe8 100644 --- a/pyanaconda/packaging/dnfpayload.py +++ b/pyanaconda/packaging/dnfpayload.py @@ -95,9 +95,11 @@ class DNFPayload(packaging.PackagePayload): def _add_repo(self, ksrepo): repo = self._base.build_repo(ksrepo.name) url = ksrepo.baseurl + mirrorlist = ksrepo.mirrorlist if url: repo.baseurl = [url] - repo.mirrorlist = ksrepo.mirrorlist + if mirrorlist: + repo.mirrorlist = mirrorlist repo.sslverify = not (ksrepo.noverifyssl or flags.noverifyssl) repo.enable() self._base.repos.add(repo) -- 1.8.3.1

2 3

[master] Change needed for the Initial Setup
by Vratislav Podzimek 13 Sep '13

13 Sep '13

Initial Setup should terminate itself automatically if there is nothing to do in it. Example of that is if there are no spokes to be shown. Vratislav Podzimek (1): Do not schedule hubs with no spokes available (#1006357) pyanaconda/ui/tui/__init__.py | 5 +++-- pyanaconda/ui/tui/hubs/__init__.py | 3 +++ pyanaconda/ui/tui/hubs/summary.py | 6 +++++- pyanaconda/ui/tui/simpleline/base.py | 13 +++++++++++-- 4 files changed, 22 insertions(+), 5 deletions(-) -- 1.7.11.7

2 4

[master][PATCH] Use pigz to create updates.img
by Vratislav Podzimek 13 Sep '13

13 Sep '13

Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- scripts/makeupdates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makeupdates b/scripts/makeupdates index 273428a..761fcf2 100755 --- a/scripts/makeupdates +++ b/scripts/makeupdates @@ -389,7 +389,7 @@ def addRpms(updates_path, add_rpms): def createUpdatesImage(cwd, updates): os.chdir(updates) - os.system("find . | cpio -c -o | gzip -9cv > %s/updates.img" % (cwd,)) + os.system("find . | cpio -c -o | pigz -9cv > %s/updates.img" % (cwd,)) sys.stdout.write("updates.img ready\n") def check_for_new_packages(tag, arch, added_rpms, specfile_path): -- 1.7.11.7

2 1

[master][PATCH] Retranslate language filtering placeholder texts (#1007090)
by Vratislav Podzimek 13 Sep '13

13 Sep '13

On the Welcome spoke we need to retranslate the language filtering entry's placeholder text manually, on the Langsupport spoke it happens automatically if it is marked as translatable. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- pyanaconda/ui/gui/spokes/langsupport.glade | 2 +- pyanaconda/ui/gui/spokes/welcome.glade | 2 +- pyanaconda/ui/gui/spokes/welcome.py | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/langsupport.glade b/pyanaconda/ui/gui/spokes/langsupport.glade index 6727c9b..d499780 100644 --- a/pyanaconda/ui/gui/spokes/langsupport.glade +++ b/pyanaconda/ui/gui/spokes/langsupport.glade @@ -171,7 +171,7 @@ <property name="invisible_char">●</property> <property name="invisible_char_set">True</property> <property name="secondary_icon_name">edit-clear-symbolic</property> - <property name="placeholder_text">Type here to search.</property> + <property name="placeholder_text" translatable="yes">Type here to search.</property> <signal name="changed" handler="on_entry_changed" swapped="no"/> </object> <packing> diff --git a/pyanaconda/ui/gui/spokes/welcome.glade b/pyanaconda/ui/gui/spokes/welcome.glade index da6d7ae..8dafd38 100644 --- a/pyanaconda/ui/gui/spokes/welcome.glade +++ b/pyanaconda/ui/gui/spokes/welcome.glade @@ -447,7 +447,7 @@ <property name="invisible_char">●</property> <property name="invisible_char_set">True</property> <property name="secondary_icon_name">edit-clear-symbolic</property> - <property name="placeholder_text">Type here to search.</property> + <property name="placeholder_text" translatable="yes">Type here to search.</property> <signal name="changed" handler="on_entry_changed" swapped="no"/> <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/> </object> diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index 79efdd2..e4fca21 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -224,6 +224,13 @@ class WelcomeLanguageSpoke(LangLocaleHandler, StandaloneSpoke): xlated = _(before) % {"name" : productName.upper(), "version" : productVersion} welcomeLabel.set_label(xlated) + # Retranslate the language (filtering) entry's placeholder text + languageEntry = self.builder.get_object("languageEntry") + if not languageEntry in self._origStrings: + self._origStrings[languageEntry] = languageEntry.get_placeholder_text() + + languageEntry.set_placeholder_text(_(self._origStrings[languageEntry])) + # And of course, don't forget the underlying window. self.window.set_property("distribution", distributionText().upper()) self.window.retranslate(lang) -- 1.7.11.7

2 1

[PATCH] Fix yet another pylint error caught after the fact.
by Chris Lumens 13 Sep '13

13 Sep '13

Guess what I'm getting tired of doing. --- pyanaconda/desktop.py | 2 +- pyanaconda/simpleconfig.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/desktop.py b/pyanaconda/desktop.py index eaf73c5..3d73d32 100644 --- a/pyanaconda/desktop.py +++ b/pyanaconda/desktop.py @@ -49,7 +49,7 @@ class Desktop(SimpleConfigFile): super(Desktop, self).__init__() self.runlevel = 3 - def write(self, filename=None): + def write(self, filename=None, use_tmp=True): if self.getDefaultDesktop(): f = open(ROOT_PATH + "/etc/sysconfig/desktop", "w") f.write(str(self)) diff --git a/pyanaconda/simpleconfig.py b/pyanaconda/simpleconfig.py index ae2e3dc..5e474e9 100644 --- a/pyanaconda/simpleconfig.py +++ b/pyanaconda/simpleconfig.py @@ -181,7 +181,7 @@ class IfcfgFile(SimpleConfigFile): SimpleConfigFile.read(self, self.path) return len(self.info) - def write(self, directory=None): + def write(self, directory=None, use_tmp=False): """ Writes values into ifcfg file. """ @@ -192,4 +192,4 @@ class IfcfgFile(SimpleConfigFile): # ifcfg-rh is using inotify IN_CLOSE_WRITE event so we don't use # temporary file for new configuration - SimpleConfigFile.write(self, path, use_tmp=False) + SimpleConfigFile.write(self, path, use_tmp=use_tmp) -- 1.8.1.2

3 6

[rhel6-branch V02] Fix traceback occurring in ppc bootloader code. (#1007724)
by Samantha N. Bueno 13 Sep '13

13 Sep '13

There was still an error in the original, so....here we go again. This actually *does* fix the traceback. ==== This was caused by a couple errors from 6732cc71. Resolves: rhbz#1007724 Related: rhbz#877852 --- booty/ppc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/booty/ppc.py b/booty/ppc.py index 096de39..2cb2103 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -5,11 +5,12 @@ from booty import BootyNoKernelWarning from util import getDiskPart from bootloaderInfo import * import iutil +import parted class ppcBootloaderInfo(bootloaderInfo): def pickPReP(self): # if we created a new PReP partition, pick that - for a in self.storage.findActions(type="create", obj="format"): + for a in self.storage.devicetree.findActions(type="create", object="format"): if a.format.type == "prepboot" and a.device in self.storage.devices: return a.device @@ -38,7 +39,6 @@ class ppcBootloaderInfo(bootloaderInfo): return prepdevs[0] def getBootDevs(self, bl): - import parted retval = [] machine = iutil.getPPCMachine() -- 1.7.11.7

2 1

[master][PATCH] Ignore the whole m4 directory
by Vratislav Podzimek 13 Sep '13

13 Sep '13

Otherwise 'git clean -df' removes it. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e888426..e9d365c 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,7 @@ ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 -m4/*.m4 +m4/ missing po/*.gmo po/*.po -- 1.7.11.7

2 1

[master] XklWrapper refactorization
by Vratislav Podzimek 13 Sep '13

13 Sep '13

These patches have one goal -- to avoid creating new instances of the XklWrapper class on language change because it is an expensive action. However, they also bring better code, more documentation, better "unittest test pontential" and altogether they are -2 lines of code. They apply to David Shea's patches for keyboard layouts and switching options translations because I'd like to keep track of the changes in our git history and it would also allow us to easily revert changes made here if there are any problems within. Vratislav Podzimek (4): Remove the Layout class and things we don't need in XklWrapper Move upcase_first_letter function to iutil Improve XklWrapper's API Translate layout and switching options descriptions on the fly pyanaconda/iutil.py | 21 ++++++ pyanaconda/keyboard.py | 122 +++++++++++++++++------------------ pyanaconda/localization.py | 27 ++------ pyanaconda/ui/gui/spokes/keyboard.py | 18 +++--- 4 files changed, 93 insertions(+), 95 deletions(-) -- 1.7.11.7

2 8

← Newer
1
...
7
8
9
10
11
12
13
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches September 2013