[master] Clear Update Settings when Done clicked (#1167014)
by Brian C. Lane
If the right side needs to be saved clicking Done handles that, but it
doesn't clear the button state. This blocks exiting the spoke on the 2nd
click until it is pressed.
---
pyanaconda/ui/gui/spokes/custom.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 77f3414..f11255f 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1512,6 +1512,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
# Save anything from the currently displayed mountpoint.
self._save_right_side(self._current_selector)
+ self._applyButton.set_sensitive(False)
# And then display the summary screen. From there, the user will either
# head back to the hub, or stay on the custom screen.
--
1.9.3
9 years, 5 months
[PATCH] Fix adding partition after ActionDestroyDevice canceling
by Vojtěch Trefný
---
blivet/devices/partition.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py
index c67e315..24f85b3 100644
--- a/blivet/devices/partition.py
+++ b/blivet/devices/partition.py
@@ -496,7 +496,9 @@ class PartitionDevice(StorageDevice):
self.partedPartition in self.disk.format.partitions:
return
- self.disk.format.addPartition(self.partedPartition)
+ self.disk.format.addPartition(self.partedPartition.geometry.start,
+ self.partedPartition.geometry.end,
+ self.partedPartition.type)
# Look up the path by start sector to deal with automatic renumbering of
# logical partitions on msdos disklabels.
--
2.1.0
9 years, 5 months
[master/rhel7-branch] Fix PWQError issues. (#1066988)
by Samantha N. Bueno
PWQError.message is empty, so call PWQError.args[index] instead to get
the actual error message and keep pylint happy.
Resolves: rhbz#1066988
---
pyanaconda/ui/gui/spokes/lib/passphrase.py | 2 +-
pyanaconda/ui/gui/spokes/password.py | 4 ++--
pyanaconda/ui/gui/spokes/user.py | 4 ++--
pyanaconda/ui/tui/spokes/__init__.py | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py
index 226159b..ef830d9 100644
--- a/pyanaconda/ui/gui/spokes/lib/passphrase.py
+++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py
@@ -104,7 +104,7 @@ class PassphraseDialog(GUIObject):
try:
strength = self._pwq.check(passphrase, None, None)
except pwquality.PWQError as e:
- self._pwq_error = e.message
+ self._pwq_error = e.args[1]
if strength < 50:
val = 1
diff --git a/pyanaconda/ui/gui/spokes/password.py b/pyanaconda/ui/gui/spokes/password.py
index 72ecc96..2cf390d 100644
--- a/pyanaconda/ui/gui/spokes/password.py
+++ b/pyanaconda/ui/gui/spokes/password.py
@@ -117,7 +117,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
strength = checkPassword(self.pw.get_text())
_pwq_error = None
except PWQError as e:
- _pwq_error = e.message
+ _pwq_error = e.args[1]
strength = 0
if strength < 50:
@@ -183,7 +183,7 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
pass
else:
self._error = _("You have provided a weak password: %s. "
- " Press Done again to use anyway.") % e.message
+ " Press Done again to use anyway.") % e.args[1]
self._oldweak = pw
return False
diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py
index e40b413..813de24 100644
--- a/pyanaconda/ui/gui/spokes/user.py
+++ b/pyanaconda/ui/gui/spokes/user.py
@@ -351,7 +351,7 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
strength = self._pwq.check(self.pw.get_text(), None, None)
_pwq_error = None
except pwquality.PWQError as e:
- _pwq_error = e.message
+ _pwq_error = e.args[1]
strength = 0
if strength < 50:
@@ -426,7 +426,7 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
pass
else:
self._error = _("You have provided a weak password: %s. "
- " Press Done again to use anyway.") % e.message
+ " Press Done again to use anyway.") % e.args[1]
self._oldweak = pw
return False
diff --git a/pyanaconda/ui/tui/spokes/__init__.py b/pyanaconda/ui/tui/spokes/__init__.py
index 84f1c3c..bc3077a 100644
--- a/pyanaconda/ui/tui/spokes/__init__.py
+++ b/pyanaconda/ui/tui/spokes/__init__.py
@@ -126,7 +126,7 @@ class EditTUIDialog(NormalTUISpoke):
if strength < 50:
error = _("The password you have provided is weak")
except PWQError as e:
- error = e.message
+ error = e.args[1]
if error:
error = _("You have provided a weak password: %s. ") % error
error += _("\nWould you like to use it anyway?")
--
1.9.3
9 years, 5 months
[blivet:master 0/2] Add a new pylint checker (v2)
by Anne Mulhern
The changes from previous version are:
* Fixed a bug in the checker where it would give false positive in case
where there is an overridden value that is not a literal. There were no
instances where this was occurring in the code, so it was not an obvious
problem.
* Commented the checker analysis more heavily to document its restrictions.
* Added an additional checker in the same vein that detects a tiny subset of
pointless function overrides.
* Removed the (1) pointless function override that the new checker found
(in second patch).
mulhern (2):
Add a simple pylint checker for pointless overrides.
Remove pointless overrides.
blivet/formats/biosboot.py | 1 -
blivet/formats/disklabel.py | 1 -
blivet/formats/dmraid.py | 3 -
blivet/formats/fs.py | 10 --
blivet/formats/luks.py | 1 -
blivet/formats/multipath.py | 3 -
blivet/formats/prepboot.py | 1 -
tests/formats_test/init_test.py | 3 -
tests/pylint/pointless-override.py | 194 +++++++++++++++++++++++++++++++++++++
tests/pylint/pylint-one.sh | 2 +-
10 files changed, 195 insertions(+), 24 deletions(-)
create mode 100644 tests/pylint/pointless-override.py
--
1.9.3
9 years, 5 months
[initial-setup][rhel7-branch/master][PATCH] Move the firstboot(windowmanager) dependency to the GUI package
by Martin Kolman
Signed-off-by: Martin Kolman <mkolman(a)redhat.com>
---
initial-setup.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/initial-setup.spec b/initial-setup.spec
index 8e9d2ec..57c79bd 100644
--- a/initial-setup.spec
+++ b/initial-setup.spec
@@ -35,7 +35,6 @@ Requires: anaconda-tui >= %{anacondaver}
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
-Requires: firstboot(windowmanager)
Requires: libreport-python
Requires: python-di
Conflicts: firstboot < 19.2
@@ -49,6 +48,7 @@ Summary: Graphical user interface for the initial-setup utility
Requires: gtk3
Requires: anaconda-gui >= %{anacondaver}
Requires: %{name} = %{version}-%{release}
+Requires: firstboot(windowmanager)
%description gui
The initial-setup-gui package contains a graphical user interface for the
--
1.9.3
9 years, 5 months
[rhel7] Fix the ISO chooser dialog (#1163026)
by David Shea
Something went wrong in a cherry-pick somewhere probably.
Resolves: rhbz#1163026
---
pyanaconda/ui/gui/spokes/source.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 74bf2a8..8af04b9 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -234,12 +234,11 @@ class IsoChooser(GUIObject):
def __init__(self, data):
GUIObject.__init__(self, data)
- self._chooser = self.builder.get_object("isoChooser")
+ self._chooser = self.builder.get_object("isoChooserDialog")
# pylint: disable=W0221
def refresh(self, currentFile=""):
GUIObject.refresh(self)
- self._chooser = self.builder.get_object("isoChooser")
self._chooser.connect("current-folder-changed", self.on_folder_changed)
self._chooser.set_filename(constants.ISO_DIR + "/" + currentFile)
--
1.9.3
9 years, 5 months
[anaconda][rhel7-branch][PATCH] Don't crash due to missing addons
by Martin Kolman
Looks like the master/f21-branch patch for this did not land in rhel7-branch, so I've cherry-picked it
and changed the bug numbers to the RHEL7 ones.
Vratislav Podzimek (1):
Just preserve the %addon header args if an addon is missing (#1155955)
pyanaconda/addons.py | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
--
1.9.3
9 years, 5 months
[PATCH] do not delete liveimg --url=file:/// file
by Gene Czarcinski
If liveimg --url=file:// do not delete the referenced file. Only
delete those files which are downloaded. (RHBZ 1164585)
---
pyanaconda/packaging/livepayload.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py
index fbdb38f..6b235ea 100644
--- a/pyanaconda/packaging/livepayload.py
+++ b/pyanaconda/packaging/livepayload.py
@@ -431,13 +431,20 @@ class LiveImageKSPayload(LiveImagePayload):
def postInstall(self):
""" Unmount image, remove image file from target
+ unless filr:// specified in which case just
+ umount it.
"""
super(LiveImageKSPayload, self).postInstall()
if os.path.exists(IMAGE_DIR+"/LiveOS"):
blivet.util.umount(IMAGE_DIR)
- if os.path.exists(self.image_path):
+ if self.data.method.url.startswith("file://"):
+ log.debug("live-postInstall: file://specified, just umount")
+ blivet.util.umount(self.image_path)
+
+ elif os.path.exists(self.image_path):
+ log.debug("live-postInstall: delete downloaded file")
os.unlink(self.image_path)
@property
--
1.9.3
9 years, 5 months
[f21/master] Install optional product and updates packages (#1155228)
by Brian C. Lane
To make it easier for users to add product and updates images look for
any packages that provide lorax-product-* or lorax-updates-*
Related: rhbz#1155228
---
share/runtime-install.tmpl | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index cc3ec00..d9c678d 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -45,6 +45,12 @@ installpkg grubby
installpkg lsscsi s390utils-base s390utils-cmsfs-fuse
%endif
+## optional product.img or updates.img files
+log "Looking for extra lorax-product- packages..."
+-installpkg lorax-product-*
+log "Looking for extra lorax-updates- packages..."
+-installpkg lorax-updates-*
+
## yay, plymouth
installpkg plymouth
--
1.9.3
9 years, 5 months