[master] More test path changes
by David Shea
1) I guess and should have run distcheck before pushing the last patch, oops,
and 2) apply the git-files-only logic to all of the tests that scan for files
David Shea (1):
Make the lists of files to check consistent across all checks.
tests/Makefile.am | 1 +
tests/cppcheck/runcppcheck.sh | 9 +++++-
tests/gettext/gettext_potfiles.py | 65 ++++++++++++++++++++-------------------
tests/glade/run_glade_tests.sh | 10 +++++-
tests/pylint/runpylint.sh | 14 ++++++---
5 files changed, 62 insertions(+), 37 deletions(-)
--
1.9.0
10 years, 2 months
[blivet/master][PATCH] req_max_size is not a Size instance (#1077163)
by Vratislav Podzimek
req_max_size is an int value in mebibytes, so we shouldn't try to do any
conversion. The int() call is just to make it use the same code as the surround
lines.
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
blivet/devices.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blivet/devices.py b/blivet/devices.py
index 9e6efb4..91686c9 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -2811,7 +2811,7 @@ class LVMLogicalVolumeDevice(DMDevice):
data.grow = self.req_grow
if self.req_grow:
data.size = int(self.req_size)
- data.maxSizeMB = self.req_max_size.convertTo(spec="mib")
+ data.maxSizeMB = int(self.req_max_size)
else:
data.size = int(self.size)
--
1.8.5.3
10 years, 2 months
[anaconda:rhel7/master] Convert iter from filter model iter to backing store iter (#1074188)
by Anne Mulhern
Resolves: rhbz#1074188
Previously the backing store was being indexed by means of an iter that
was a correct index into the filter model. It was not a correct index
into the backing store, so the set of disks checked by the user
was not the same as the set of disks actually selected.
Now the index is converted, so the set of checked disks and the set of
selected disks should be the same.
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
pyanaconda/ui/gui/spokes/filter.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/filter.py b/pyanaconda/ui/gui/spokes/filter.py
index 4bc1a50..22e2ee5 100644
--- a/pyanaconda/ui/gui/spokes/filter.py
+++ b/pyanaconda/ui/gui/spokes/filter.py
@@ -611,7 +611,10 @@ class FilterSpoke(NormalSpoke):
if not path:
return
- itr = self._store.get_iter(path)
+ page_index = self._notebook.get_current_page()
+ filter_model = self.pages[page_index].model
+ model_itr = filter_model.get_iter(path)
+ itr = filter_model.convert_iter_to_child_iter(model_itr)
self._store[itr][1] = not self._store[itr][1]
if self._store[itr][1] and self._store[itr][3] not in self.selected_disks:
--
1.8.3.1
10 years, 2 months
[PATCH] Provide ways in kickstart to skip kernel and bootloader (#1074522).
by Chris Lumens
This patch (along with those in pykickstart and blivet) allows for a kickstart
file to do the following:
(1) Prevent any kernel package from being installed by putting "-kernel" in the
%packages section.
(2) Prevent any bootloader package from being installed (and therefore, any
bootloader config from being written) by putting "bootloader --disabled" in
the command section.
---
anaconda.spec.in | 4 ++--
pyanaconda/install.py | 4 +++-
pyanaconda/packaging/__init__.py | 3 +++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 61ae731..53e2339 100755
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -21,7 +21,7 @@ Source0: %{name}-%{version}.tar.bz2
# Also update in AM_GNU_GETTEXT_VERSION in configure.ac
%define gettextver 0.18.3
%define intltoolver 0.31.2-3
-%define pykickstartver 1.99.49
+%define pykickstartver 1.99.50
%define yumver 3.4.3-91
%define dnfver 0.4.15
%define partedver 1.8.1
@@ -91,7 +91,7 @@ The anaconda package is a metapackage for the Anaconda installer.
%package core
Summary: Core of the Anaconda installer
Requires: dnf >= %{dnfver}
-Requires: python-blivet >= 0.44
+Requires: python-blivet >= 0.45
Requires: python-meh >= %{mehver}
Requires: libreport-anaconda >= 2.0.21-1
Requires: libselinux-python
diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index 1c1ece1..ffaeab2 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -156,6 +156,8 @@ def doInstall(storage, payload, ksdata, instClass):
# system is bootable and configurable, and some other packages in order
# to finish setting up the system.
packages = storage.packages + ["authconfig", "firewalld"] + ksdata.realm.packages
+ if not ksdata.bootloader.disabled:
+ packages += storage.bootloader.packages
# don't try to install packages from the install class' ignored list
packages = [p for p in packages if p not in instClass.ignoredPackages]
@@ -169,7 +171,7 @@ def doInstall(storage, payload, ksdata, instClass):
payload.postInstall()
# Do bootloader.
- if not flags.flags.dirInstall:
+ if not flags.flags.dirInstall and not ksdata.bootloader.disabled:
with progress_report(_("Installing bootloader")):
writeBootLoader(storage, payload, instClass, ksdata)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py
index 99952d7..7790ccc 100644
--- a/pyanaconda/packaging/__init__.py
+++ b/pyanaconda/packaging/__init__.py
@@ -699,6 +699,9 @@ class PackagePayload(Payload):
@property
def kernelPackages(self):
+ if "kernel" in self.data.packages.excludedList:
+ return []
+
kernels = ["kernel"]
if isys.isPaeAvailable():
--
1.8.3.1
10 years, 2 months
[PATCH] DNFPayload: apply the kicstart excludedList.
by Ales Kozumplik
From: Ales Kozumplik <ales(a)redhat.com>
---
anaconda.spec.in | 2 +-
pyanaconda/packaging/dnfpayload.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index bf1a5d7..a8d551c 100755
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -23,7 +23,7 @@ Source0: %{name}-%{version}.tar.bz2
%define intltoolver 0.31.2-3
%define pykickstartver 1.99.49
%define yumver 3.4.3-91
-%define dnfver 0.4.15
+%define dnfver 0.4.18
%define partedver 1.8.1
%define pypartedver 2.5-2
%define pythonpyblockver 0.45
diff --git a/pyanaconda/packaging/dnfpayload.py b/pyanaconda/packaging/dnfpayload.py
index 23c8623..1124817 100644
--- a/pyanaconda/packaging/dnfpayload.py
+++ b/pyanaconda/packaging/dnfpayload.py
@@ -306,7 +306,7 @@ class DNFPayload(packaging.PackagePayload):
types.add('default')
if optional:
types.add('optional')
- self._base.select_group(grp, types)
+ self._base.group_install(grp, types, self.data.packages.excludedList)
def _select_kernel_package(self):
kernels = self.kernelPackages
--
1.8.5.3
10 years, 2 months
[master] Few more little steps to sane Custom spoke
by Vratislav Podzimek
13 small and hopefully easy-understandable patches for the Custom partitioning
spoke and the related code. Another ~15 will probably appear during this week,
but these are the first steps.
Vratislav Podzimek (13):
Rename the __storage attrbitue to a more propriate name
Move translated_new_install_name to the right place
Simplify label validation and error reporting
Simplify mountpoint validation and error reporting
Make custom partitioning helper constants look as constants
Implement a function to get container type name
Make getting raid level less hacky
Make code to get Size instance from user's input reusable
Add and use MountpointSelector's attributes and properties
Implement and use a decorator for initialization needed
Fix typo in the comment
Decide on supported RAID levels in a better way
Make the ui_storage_logger reusable
pyanaconda/product.py | 4 +
pyanaconda/storage_utils.py | 92 +++++++
pyanaconda/ui/gui/spokes/custom.glade | 45 +--
pyanaconda/ui/gui/spokes/custom.py | 305 +++++++++++----------
.../ui/gui/spokes/lib/custom_storage_helpers.glade | 45 +--
.../ui/gui/spokes/lib/custom_storage_helpers.py | 167 +++--------
widgets/python/AnacondaWidgets.py | 20 ++
7 files changed, 331 insertions(+), 347 deletions(-)
create mode 100644 pyanaconda/storage_utils.py
--
1.8.5.3
10 years, 2 months
[PATCH] Remove obsolete firstaidkit packages (#1076237)
by Brian C. Lane
---
share/runtime-install.tmpl | 3 ---
1 file changed, 3 deletions(-)
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index e4c0336..b3bd722 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -9,9 +9,6 @@ installpkg iscsi-initiator-utils
## speed up compression on multicore systems
installpkg pigz
-## firstaidkit (rescue mode) packages
-installpkg firstaidkit-plugin-{passwd,key-recovery,mdadm-conf}
-
## kernel and firmware
installpkg kernel
installpkg grubby
--
1.8.5.3
10 years, 2 months
[master] Another set of tweaks for the Custom spoke
by Vratislav Podzimek
These patches make the Custom spoke refresh a bit faster and make the code
better readable and maintainable. Well, at least for me.
Vratislav Podzimek (5):
Use GtkActionList when populating filesystem store
Hide and unhide the same set of disks in the Custom spoke
Get new devices only once in the _do_refresh method
Short-circuit testing if root has any devices
Move accordion population into a separate function
pyanaconda/ui/gui/spokes/custom.py | 83 +++++++++++++++++++++-----------------
1 file changed, 47 insertions(+), 36 deletions(-)
--
1.8.5.3
10 years, 2 months
[PATCH] Skip the updates directory when running pylint
by David Shea
---
tests/pylint/runpylint.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/pylint/runpylint.sh b/tests/pylint/runpylint.sh
index 32328c1..3156238 100755
--- a/tests/pylint/runpylint.sh
+++ b/tests/pylint/runpylint.sh
@@ -92,7 +92,7 @@ if [ -z "$FILES" ]; then
# Find any file in the list of directories that either ends in .py
# or contains #!/usr/bin/python in the first line.
# Scan everything except old_tests
- FILES="$(find "${top_srcdir}" -type d -name old_tests -prune -o -type f \( -name '*.py' -o -exec awk -e 'NR==1 { if ($0 ~ /^#!\/usr\/bin\/python/) exit 0; else exit 1; }' -e 'END { if (NR == 0) exit 1; }' {} \; \) -print)"
+ FILES="$(find "${top_srcdir}" -type d -name old_tests -prune -o -type d -name updates -prune -o -type f \( -name '*.py' -o -exec awk -e 'NR==1 { if ($0 ~ /^#!\/usr\/bin\/python/) exit 0; else exit 1; }' -e 'END { if (NR == 0) exit 1; }' {} \; \) -print)"
fi
num_cpus=$(getconf _NPROCESSORS_ONLN)
--
1.8.5.3
10 years, 2 months
[PATCH] Fix XDG_RUNTIME_DIR not set messages by creating one
by David Shea
---
tests/pylint/runpylint.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tests/pylint/runpylint.sh b/tests/pylint/runpylint.sh
index 32328c1..a91e6d4 100755
--- a/tests/pylint/runpylint.sh
+++ b/tests/pylint/runpylint.sh
@@ -8,6 +8,13 @@
# to stdout and this script will exit with a status of 1, if no (non filtered)
# warnings are found it exits with a status of 0
+# XDG_RUNTIME_DIR is "required" to be set, so make one up in case something
+# actually tries to do something with it
+if [ -z "$XDG_RUNTIME_DIR" ]; then
+ export XDG_RUNTIME_DIR="$(mktemp -d)"
+ trap "rm -rf \"$XDG_RUNTIME_DIR\"" EXIT
+fi
+
# If $top_srcdir is set, assume this is being run from automake and we don't
# need to keep a separate log
export pylint_log=0
--
1.9.0
10 years, 2 months