Merge branch 'maint'

5 files changed, 8 insertions, 8 deletions

diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 7aab5161..aaadd86d 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -488,7 +488,7 @@ void SYMEXPORT alpm_option_add_ignorepkg(const char *pkg)
 	handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg));
 }
 
-void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs)
+void SYMEXPORT alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs)
 {
 	if(handle->ignorepkg) FREELIST(handle->ignorepkg);
 	if(ignorepkgs) handle->ignorepkg = ignorepkgs;
@@ -534,7 +534,7 @@ void SYMEXPORT alpm_option_add_ignoregrp(const char *grp)
 	handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp));
 }
 
-void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps)
+void SYMEXPORT alpm_option_set_ignoregrps(alpm_list_t *ignoregrps)
 {
 	if(handle->ignoregrp) FREELIST(handle->ignoregrp);
 	if(ignoregrps) handle->ignoregrp = ignoregrps;
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 7e1bcd55..a6e7af34 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -854,7 +854,7 @@ void _alpm_pkg_free(pmpkg_t *pkg)
 }
 
 /* Is pkgB an upgrade for pkgA ? */
-int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
+int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
 {
 	int cmp = 0;
 
diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index dbb3f599..ef2a9335 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -77,7 +77,7 @@ pmpkg_t* _alpm_pkg_new(const char *name, const char *version);
 pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg);
 void _alpm_pkg_free(pmpkg_t *pkg);
 int _alpm_pkg_cmp(const void *p1, const void *p2);
-int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg);
+int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg);
 pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full);
 pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack);
 int _alpm_pkg_should_ignore(pmpkg_t *pkg);
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index a94848b5..086ed733 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -97,9 +97,9 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 		return(0);
 	}
 
-	EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
-
 	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
+		EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
+
 		_alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n");
 		lp = alpm_checkdeps(db, 1, trans->packages, NULL);
 		if(lp != NULL) {
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 5ffa5de0..2f6600e0 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -238,7 +238,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans,
 		}
 
 		/* compare versions and see if we need to upgrade */
-		if(alpm_pkg_compare_versions(local, spkg)) {
+		if(_alpm_pkg_compare_versions(local, spkg)) {
 			_alpm_log(PM_LOG_DEBUG, "%s elected for upgrade (%s => %s)\n",
 					alpm_pkg_get_name(local), alpm_pkg_get_version(local),
 					alpm_pkg_get_version(spkg));
@@ -333,7 +333,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 
 	local = _alpm_db_get_pkgfromcache(db_local, alpm_pkg_get_name(spkg));
 	if(local) {
-		if(alpm_pkg_compare_versions(local, spkg) == 0) {
+		if(_alpm_pkg_compare_versions(local, spkg) == 0) {
 			/* spkg is NOT an upgrade */
 			if(trans->flags & PM_TRANS_FLAG_NEEDED) {
 				_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"),