---
anaconda | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/anaconda b/anaconda
index 4260dd6..77b61ee 100755
--- a/anaconda
+++ b/anaconda
@@ -469,7 +469,7 @@ def setupDisplay(anaconda, opts, addon_paths=None):
# disable VNC over text question when not enough memory is available
if blivet.util.total_memory() < isys.MIN_GUI_RAM:
- stdoutLog.warning("Not asking for VNC because current memory (%d) <
MIN_GUI_RAM (%d)" % (iutil.memInstalled(), isys.MIN_GUI_RAM))
+ stdoutLog.warning("Not asking for VNC because current memory (%d) <
MIN_GUI_RAM (%d)" % (blivet.util.total_memory(), isys.MIN_GUI_RAM))
flags.vncquestion = False
# disable VNC question if text mode is requested and this is a ks install
--
1.8.1.2
Show replies by date
---
pyanaconda/ui/gui/spokes/custom.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 4d0a1ec..b11f465 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -1671,7 +1671,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
% (dialog.size, self._free_space))
# if no size was entered, request as much of the free space as possible
- if dialog.size.convertTo(spec="mb") < 1:
+ if not dialog.size or dialog.size.convertTo(spec="mb") < 1:
size = self._free_space
else:
size = dialog.size
--
1.8.1.2
The correct kickstart behavior here is to error and let the user change the
source themselves. We should not fall back to the closest mirror or whatever.
Lots of these changes are to make the status message correct.
---
pyanaconda/packaging/yumpayload.py | 7 ++++---
pyanaconda/ui/gui/spokes/source.py | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index ecd5598..1209f85 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -185,7 +185,7 @@ class YumPayload(PackagePayload):
self._writeYumConfig()
self._setup = True
- self.updateBaseRepo()
+ self.updateBaseRepo(fallback=not flags.automatedInstall)
# When setup is called, it's already in a separate thread. That thread
# will try to select groups right after this returns, so make sure we
@@ -457,13 +457,14 @@ reposdir=%s
# see if we can get a usable base repo from self.data.method
try:
self._configureBaseRepo(self.storage, checkmount=checkmount)
- except PayloadError as e:
+ except (MetadataError, PayloadError) as e:
if not fallback:
with _yum_lock:
for repo in self._yum.repos.repos.values():
if repo.enabled:
self.disableRepo(repo.id)
- raise
+
+ return
# this preserves the method details while disabling it
self.data.method.method = None
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 0a47679..fef1e2e 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -453,7 +453,7 @@ class SourceSpoke(NormalSpoke):
@property
def completed(self):
- if flags.automatedInstall and not self.data.method.method:
+ if flags.automatedInstall and (not self.data.method.method or not
self.payload.baseRepo):
return False
else:
return not self._error and self.status and self.status != _("Nothing
selected")
@@ -477,7 +477,7 @@ class SourceSpoke(NormalSpoke):
return _("Checking software dependencies...")
elif not self.ready:
return _("Not ready")
- elif self._error:
+ elif self._error or not self.payload.baseRepo:
return _("Error setting up software source")
elif self.data.method.method == "url":
return self.data.method.url or self.data.method.mirrorlist
--
1.8.1.2
---
pyanaconda/ui/gui/spokes/storage.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 22cab62..17634d7 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -403,7 +403,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
self.run()
finally:
self._ready = True
- hubQ.send_ready(self.__class__.__name__, False)
+ hubQ.send_ready(self.__class__.__name__, True)
@property
def completed(self):
--
1.8.1.2
I think the "Not ready" message is showing up in this instance because of how
we are updating the status of every spoke when one spoke is updated now.
---
pyanaconda/ui/gui/spokes/source.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index fef1e2e..1a2b280 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -476,7 +476,7 @@ class SourceSpoke(NormalSpoke):
if threadMgr.get(constants.THREAD_CHECK_SOFTWARE):
return _("Checking software dependencies...")
elif not self.ready:
- return _("Not ready")
+ return _(BASEREPO_SETUP_MESSAGE)
elif self._error or not self.payload.baseRepo:
return _("Error setting up software source")
elif self.data.method.method == "url":
--
1.8.1.2
This can be pretty slow, and I don't want to see all the little pauses on
the final release.
---
pyanaconda/packaging/yumpayload.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 1209f85..bb4e6c4 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -100,6 +100,10 @@ _private_yum_lock = threading.RLock()
class YumLock(object):
def __enter__(self):
+ if isFinal:
+ _private_yum_lock.acquire()
+ return _private_yum_lock
+
frame = inspect.stack()[2]
threadName = threading.currentThread().name
@@ -110,7 +114,9 @@ class YumLock(object):
def __exit__(self, exc_type, exc_val, exc_tb):
_private_yum_lock.release()
- log.info("gave up _yum_lock for %s" % threading.currentThread().name)
+
+ if not isFinal:
+ log.info("gave up _yum_lock for %s" %
threading.currentThread().name)
_yum_lock = YumLock()
_yum_cache_dir = "/tmp/yum.cache"
--
1.8.1.2
These all look good to me.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic