Attachment 495099 Details for Bug 764677

[patch] correct calculate package size

0001-zypp-Correct-calculate-package-size.patch (text/plain), 1.94 KB, created by Max Lin on 2012-06-18 07:57:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Lin

Created: 2012-06-18 07:57:25 UTC

Size: 1.94 KB

patch

obsolete

>From 0adfc3c385f8bcf7dfd0409a5886f6d2b14468f7 Mon Sep 17 00:00:00 2001
>From: Max Lin <max.lin@gmx.com>
>Date: Mon, 18 Jun 2012 15:33:27 +0800
>Subject: zypp: Correct calculate package size
>
>Since the return size no longer is KBytes in libzypp, but its Bytes,
>therefore do not need do size * 1024 started from libzypp version 11.4.0.
>---
> backends/zypp/pk-backend-zypp.cpp |    6 ++++++
> configure.ac                      |    8 ++++++++
> 2 files changed, 14 insertions(+), 0 deletions(-)
>
>diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
>index f7398e0..6641caf 100644
>--- a/backends/zypp/pk-backend-zypp.cpp
>+++ b/backends/zypp/pk-backend-zypp.cpp
>@@ -19,6 +19,8 @@
>  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>  */
> 
>+#include "config.h"
>+
> #include <gmodule.h>
> #include <glib.h>
> #include <pk-backend.h>
>@@ -580,7 +582,11 @@ backend_get_details_thread (PkBackend *backend)
> 						    group,
> 						    package.lookupStrAttribute (sat::SolvAttr::description).c_str (),
> 						    package.lookupStrAttribute (sat::SolvAttr::url).c_str (),
>+#if ZYPP_RETURN_BYTES
>+						    size);
>+#else /* ZYPP_RETURN_BYTES */
> 						    size * 1024);
>+#endif /* ZYPP_RETURN_BYTES */
> 			}
> 
> 		} catch (const target::rpm::RpmException &ex) {
>diff --git a/configure.ac b/configure.ac
>index 12a3610..ba2cf01 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -742,8 +742,16 @@ fi
> 
> if test x$enable_zypp = xyes; then
> 	PKG_CHECK_MODULES(ZYPP, libzypp >= 6.16.0)
>+	PKG_CHECK_MODULES([LIBZYPP_RETURN_BYTES], libzypp >= 11.4.0, ZYPP_RETURN_BYTES="yes", ZYPP_RETURN_BYTES="no")
>+	if test "x$ZYPP_RETURN_BYTES" = "xyes"; then
>+	    AC_DEFINE(ZYPP_RETURN_BYTES, 1, [define if libzypp return package size is bytes])
>+	fi
>+else
>+        ZYPP_RETURN_BYTES=no
> fi
> 
>+AM_CONDITIONAL(ZYPP_RETURN_BYTES, test x$ZYPP_RETURN_BYTES = xyes)
>+
> if test x$enable_slapt = xyes; then
> 	with_default_backend=dummy
> 	AC_CHECK_HEADER([slapt.h],
>-- 
>1.7.7
>

Actions: View | Diff

Attachments on bug 764677: 492931 | 492937 | 495099 | 495686