Move -Sp implementation to the front-end

This patch kills one of our hackish pseudo transactions: PRINTURIS.
(The other one is -Sw)

From now on, front-end must not call trans_commit in case of -Sp,
it should print the uris of target packages "by hand" instead.

PRINTURIS flag was removed, NOCONFLICTS flag can be passed to skip
conflict checks.

Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 20 insertions, 33 deletions

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 7ef02062..cdceaf01 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -283,7 +283,7 @@ typedef enum _pmtransflag_t {
 	PM_TRANS_FLAG_DOWNLOADONLY = 0x200,
 	PM_TRANS_FLAG_NOSCRIPTLET = 0x400,
 	PM_TRANS_FLAG_NOCONFLICTS = 0x800,
-	PM_TRANS_FLAG_PRINTURIS = 0x1000,
+	/* 0x1000 flag can go here */
 	PM_TRANS_FLAG_NEEDED = 0x2000,
 	PM_TRANS_FLAG_ALLEXPLICIT = 0x4000,
 	PM_TRANS_FLAG_UNNEEDED = 0x8000,
@@ -365,10 +365,6 @@ typedef enum _pmtransevt_t {
 	 * A line of text is passed to the callback.
 	 */
 	PM_TRANS_EVT_SCRIPTLET_INFO,
-	/** Print URI.
-	 * The database's URI and the package's filename are passed to the callback.
-	 */
-	PM_TRANS_EVT_PRINTURI,
 	/** Files will be downloaded from a repository.
 	 * The repository's tree name is passed to the callback.
 	 */
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 4a705b57..22b391bc 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -497,8 +497,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 		EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL);
 	}
 
-	/* We don't care about conflicts if we're just printing uris */
-	if(!(trans->flags & (PM_TRANS_FLAG_NOCONFLICTS | PM_TRANS_FLAG_PRINTURIS))) {
+	if(!(trans->flags & PM_TRANS_FLAG_NOCONFLICTS)) {
 		/* check for inter-conflicts and whatnot */
 		EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL);
 
@@ -838,32 +837,27 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 
 				fname = alpm_pkg_get_filename(spkg);
 				ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1));
-				if(trans->flags & PM_TRANS_FLAG_PRINTURIS) {
-					EVENT(trans, PM_TRANS_EVT_PRINTURI, (char *)alpm_db_get_url(current),
-							(char *)fname);
-				} else {
-					if(spkg->download_size != 0) {
-						alpm_list_t *delta_path = spkg->delta_path;
-						if(delta_path) {
-							alpm_list_t *dlts = NULL;
-
-							for(dlts = delta_path; dlts; dlts = dlts->next) {
-								pmdelta_t *d = dlts->data;
-
-								if(d->download_size != 0) {
-									/* add the delta filename to the download list if
-									 * it's not in the cache */
-									files = alpm_list_add(files, strdup(d->delta));
-								}
-
-								/* keep a list of the delta files for md5sums */
-								deltas = alpm_list_add(deltas, d);
+				if(spkg->download_size != 0) {
+					alpm_list_t *delta_path = spkg->delta_path;
+					if(delta_path) {
+						alpm_list_t *dlts = NULL;
+
+						for(dlts = delta_path; dlts; dlts = dlts->next) {
+							pmdelta_t *d = dlts->data;
+
+							if(d->download_size != 0) {
+								/* add the delta filename to the download list if
+								 * it's not in the cache */
+								files = alpm_list_add(files, strdup(d->delta));
 							}
 
-						} else {
-							/* not using deltas, so add the file to the download list */
-							files = alpm_list_add(files, strdup(fname));
+							/* keep a list of the delta files for md5sums */
+							deltas = alpm_list_add(deltas, d);
 						}
+
+					} else {
+						/* not using deltas, so add the file to the download list */
+						files = alpm_list_add(files, strdup(fname));
 					}
 				}
 			}
@@ -880,9 +874,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 			FREELIST(files);
 		}
 	}
-	if(trans->flags & PM_TRANS_FLAG_PRINTURIS) {
-		return(0);
-	}
 
 	/* clear out value to let callback know we are done */
 	if(handle->totaldlcb) {