Attachment 495686 Details for Bug 764677

[patch] Reworked patch, based on vuntz' comments

PackageKit-zypp-packagesize.patch (text/plain), 1.86 KB, created by Dominique Leuenberger on 2012-06-20 19:38:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominique Leuenberger

Created: 2012-06-20 19:38:55 UTC

Size: 1.86 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(-)
>
>Index: PackageKit-0.7.4/backends/zypp/pk-backend-zypp.cpp
>===================================================================
>--- PackageKit-0.7.4.orig/backends/zypp/pk-backend-zypp.cpp
>+++ PackageKit-0.7.4/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>
>@@ -571,7 +573,11 @@ backend_get_details_thread (PkBackend *b
> 						    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) {
>Index: PackageKit-0.7.4/configure.ac
>===================================================================
>--- PackageKit-0.7.4.orig/configure.ac
>+++ PackageKit-0.7.4/configure.ac
>@@ -699,6 +699,10 @@ fi
> 
> if test x$enable_zypp = xyes; then
> 	PKG_CHECK_MODULES(ZYPP, libzypp >= 6.16.0)
>+	PKG_CHECK_EXISTS(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
> fi
> 
> if test x$enable_slapt = xyes; then

Actions: View | Diff

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