[pacman-dev] CVS update of pacman-lib/lib/libalpm (server.c sync.c)

[Aaron Griffin]

    Date: Wednesday, January 31, 2007 @ 22:31:47
  Author: aaron
    Path: /home/cvs-pacman/pacman-lib/lib/libalpm

Modified: server.c (1.18 -> 1.19) sync.c (1.96 -> 1.97)

* Minor output fix (move colon so it's not part of the URL)
* Added ldconfig on --sync operations too


----------+
 server.c |    2 +-
 sync.c   |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)


Index: pacman-lib/lib/libalpm/server.c
diff -u pacman-lib/lib/libalpm/server.c:1.18 pacman-lib/lib/libalpm/server.c:1.19
--- pacman-lib/lib/libalpm/server.c:1.18	Tue Jan 30 03:14:11 2007
+++ pacman-lib/lib/libalpm/server.c	Wed Jan 31 22:31:46 2007
@@ -187,7 +187,7 @@
 				}
 
 				if(downloadLastErrCode != 0 || dlf == NULL) {
-					_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s://%s: %s"), fn,
+					_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s://%s : %s"), fn,
 										server->s_url->scheme, server->s_url->host, downloadLastErrString);
 					if(localf != NULL) {
 						fclose(localf);
Index: pacman-lib/lib/libalpm/sync.c
diff -u pacman-lib/lib/libalpm/sync.c:1.96 pacman-lib/lib/libalpm/sync.c:1.97
--- pacman-lib/lib/libalpm/sync.c:1.96	Wed Jan 31 01:10:21 2007
+++ pacman-lib/lib/libalpm/sync.c	Wed Jan 31 22:31:46 2007
@@ -1079,6 +1079,13 @@
 			unlink(i->data);
 		}
 	}
+
+	/* run ldconfig if it exists */
+	if(handle->trans->state != STATE_INTERRUPTED) {
+		_alpm_log(PM_LOG_DEBUG, _("running \"ldconfig -r %s\""), handle->root);
+		_alpm_ldconfig(handle->root);
+	}
+
 	return(0);
 
 error: