[PATCH rhel6 1/2] Adapt for libcheckisomd5 callback abi change (#555107)

[Radek Vykydal <rvykydal@xxxxxxxxxx>]

---
 anaconda.spec.in    |    3 ++-
 loader/mediacheck.c |    2 +-
 loader/windows.c    |    3 ++-
 loader/windows.h    |    2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/anaconda.spec.in b/anaconda.spec.in
index c855935..296c3d5 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -43,6 +43,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define pythoncryptsetupver 0.0.6
 %define mehver 0.4
 %define sckeyboardver 1.3.1
+%define isomd5sumver 1.0.6
 
 BuildRequires: audit-libs-devel
 BuildRequires: bzip2-devel
@@ -52,7 +53,7 @@ BuildRequires: elfutils-devel
 BuildRequires: gettext >= %{gettextver}
 BuildRequires: gtk2-devel
 BuildRequires: intltool >= %{intltoolver}
-BuildRequires: isomd5sum-devel
+BuildRequires: isomd5sum-devel >= %{isomd5sumver}
 BuildRequires: libarchive-devel
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
diff --git a/loader/mediacheck.c b/loader/mediacheck.c
index 6e96647..dfb3bde 100644
--- a/loader/mediacheck.c
+++ b/loader/mediacheck.c
@@ -96,7 +96,7 @@ int doMediaCheck(char *file, char *descr) {
                          "If applicable, please clean the disc "
                          "and try again.  If this test continues to fail you "
                          "should not continue the install."));
-    } else if (rc > 0) {
+    } else if (rc == 1) {
         logMessage(INFO, "mediacheck: %s (%s) PASSED", file, descr);
         newtWinMessage(_("Success"), _("OK"),
                        _("The image which was just tested was successfully "
diff --git a/loader/windows.c b/loader/windows.c
index 3d57136..1c7e144 100644
--- a/loader/windows.c
+++ b/loader/windows.c
@@ -66,7 +66,7 @@ void scsiWindow(const char * driver) {
         _("Loading %s driver"), driver);
 }
 
-void progressCallback(void *pbdata, long long pos, long long total) {
+int progressCallback(void *pbdata, long long pos, long long total) {
     struct progressCBdata *data = pbdata;
     char tickmark[2] = "-";
     char *ticks = "-\\|/";
@@ -77,6 +77,7 @@ void progressCallback(void *pbdata, long long pos, long long total) {
 
     newtLabelSetText(data->label, tickmark);
     newtRefresh();
+    return 0;
 }
 
 struct progressCBdata *winProgressBar(int width, int height, char *title, char *text, ...) {
diff --git a/loader/windows.h b/loader/windows.h
index f635102..a1646d4 100644
--- a/loader/windows.h
+++ b/loader/windows.h
@@ -37,7 +37,7 @@ struct progressCBdata {
     newtComponent label;
 };
 
-void progressCallback(void *pbdata, long long pos, long long total);
+int progressCallback(void *pbdata, long long pos, long long total);
 struct progressCBdata *winProgressBar(int width, int height, char *title, char *text, ...);
 
 #endif /* _WINDOWS_H_ */
-- 
1.6.0.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list