[PATCH 1/2] Use callbacks for blivet

Vratislav Podzimek vpodzime at redhat.com
Fri May 24 17:01:53 UTC 2013


Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 anaconda.spec.in       |  2 +-
 pyanaconda/install.py  | 11 +++++++++--
 pyanaconda/progress.py |  8 ++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/anaconda.spec.in b/anaconda.spec.in
index dcf6d01..efdafd2 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -75,7 +75,7 @@ BuildRequires: s390utils-devel
 %endif
 
 Requires: anaconda-widgets = %{version}-%{release}
-Requires: python-blivet >= 0.12
+Requires: python-blivet >= 0.15
 Requires: gnome-icon-theme-symbolic
 Requires: python-meh >= %{mehver}
 Requires: libreport-anaconda >= 2.0.21-1
diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index dd39442..008e2e9 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -23,7 +23,7 @@
 from pyanaconda.constants import ROOT_PATH, THREAD_PAYLOAD
 from blivet import turnOnFilesystems
 from pyanaconda.bootloader import writeBootLoader
-from pyanaconda.progress import progress_report, progressQ
+from pyanaconda.progress import progress_report, progress_message, progress_step, progressQ
 from pyanaconda.users import createLuserConf, getPassAlgo, Users
 from pyanaconda import flags
 from pyanaconda import timezone
@@ -135,7 +135,14 @@ def doInstall(storage, payload, ksdata, instClass):
     # Do partitioning.
     payload.preStorage()
 
-    turnOnFilesystems(storage, mountOnly=flags.flags.dirInstall)
+    # callbacks for blivet
+    callbacks = {"CreateFormatPre": progress_message,
+                 "CreateFormatPost": progress_step,
+                 "ResizeFormatPre": progress_message,
+                 "ResizeFormatPost": progress_step,
+                 }
+
+    turnOnFilesystems(storage, mountOnly=flags.flags.dirInstall, callbacks=callbacks)
     if not flags.flags.livecdInstall and not flags.flags.dirInstall:
         storage.write()
 
diff --git a/pyanaconda/progress.py b/pyanaconda/progress.py
index c29b355..7d9277f 100644
--- a/pyanaconda/progress.py
+++ b/pyanaconda/progress.py
@@ -50,3 +50,11 @@ def progress_report(message):
     log.info(message)
     yield
     progressQ.send_step()
+
+def progress_message(message):
+    progressQ.send_message(message)
+    log.info(message)
+
+def progress_step(message):
+    log.info(message)
+    progressQ.send_step()
-- 
1.7.11.7



More information about the anaconda-patches mailing list