From 89ebefc195ea4c68df611e2a59c1c3b0c60edd96 Mon Sep 17 00:00:00 2001 From: J. Ali Harlow Date: Thu, 13 Aug 2009 12:42:26 +0100 Subject: [PATCH] Switch to razor 0.2 API --- configure.ac | 2 +- plover/razor.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 192455f..9a640e2 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_HEADER_STDC ################################################## # Checks for libraries. ################################################## -PKG_CHECK_MODULES(RAZOR,[razor],[:],[RAZOR_LIBS=-lrazor]) +PKG_CHECK_MODULES(RAZOR,[razor >= 0.2],[:],[RAZOR_LIBS=-lrazor]) PKG_CHECK_MODULES(EXPAT,[expat],[:],[EXPAT_LIBS=-lexpat]) PKG_CHECK_MODULES(ZLIB,[zlib],[:],[ZLIB_LIBS=-lz]) LIBPLOVER_CFLAGS="$RAZOR_CFLAGS $EXPAT_CFLAGS $ZLIB_CFLAGS" diff --git a/plover/razor.c b/plover/razor.c index e849a87..4fb4c41 100644 --- a/plover/razor.c +++ b/plover/razor.c @@ -99,7 +99,6 @@ int plover_run_transaction(struct razor_transaction *trans,const char *base, { struct razor_install_iterator *ii; struct razor_package *package; - struct razor_set *set; enum razor_install_action action; struct razor_rpm *rpm; const char *name,*version,*arch; @@ -107,14 +106,14 @@ int plover_run_transaction(struct razor_transaction *trans,const char *base, int count; ii=razor_set_create_install_iterator(system,next); printf("Running Transaction\n"); - while (razor_install_iterator_next(ii,&set,&package,&action,&count)) + while (razor_install_iterator_next(ii,&package,&action,&count)) { if (action==RAZOR_INSTALL_ACTION_REMOVE) { - razor_package_get_details(set,package,RAZOR_DETAIL_NAME,&name, + razor_package_get_details(system,package,RAZOR_DETAIL_NAME,&name, RAZOR_DETAIL_LAST); printf(" Removing : %s ",name); - if (razor_package_remove(set,package,install_root,0)<0) + if (razor_package_remove(system,next,package,install_root,count)<0) printf( "\nWarning: one or more errors occurred while removing %s", name); @@ -122,7 +121,7 @@ int plover_run_transaction(struct razor_transaction *trans,const char *base, } else { - razor_package_get_details(set,package,RAZOR_DETAIL_NAME,&name, + razor_package_get_details(next,package,RAZOR_DETAIL_NAME,&name, RAZOR_DETAIL_VERSION,&version,RAZOR_DETAIL_ARCH,&arch, RAZOR_DETAIL_LAST); printf(" Installing : %s ",name); -- 1.7.1