Remove gettext calls from all PM_LOG_DEBUG messages

There is no real reason to burden our translators with these messages, as
anyone helping to debug these will probably want them in English.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 42 insertions, 40 deletions

diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index d50d6cfa..e5f00bd6 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -104,7 +104,7 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
 	ALPM_LOG_FUNC;
 
 	/* check for "recommended" package replacements */
-	_alpm_log(PM_LOG_DEBUG, _("checking for package replacements"));
+	_alpm_log(PM_LOG_DEBUG, "checking for package replacements");
 	for(i = dbs_sync; i; i = i->next) {
 		pmdb_t *db = i->data;
 
@@ -120,7 +120,8 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
 					continue;
 				}
 
-				_alpm_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), replacement, spkg->name);
+				_alpm_log(PM_LOG_DEBUG, "checking replacement '%s' for package '%s'",
+						replacement, spkg->name);
 				/* ignore if EITHER the local or replacement package are to be ignored */
 				if(alpm_list_find_str(handle->ignorepkg, spkg->name)
 					 || alpm_list_find_str(handle->ignorepkg, lpkg->name)) {
@@ -159,7 +160,7 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
 							sync->data = alpm_list_add(NULL, dummy);
 							trans->packages = alpm_list_add(trans->packages, sync);
 						}
-						_alpm_log(PM_LOG_DEBUG, _("%s-%s elected for upgrade (to be replaced by %s-%s)"),
+						_alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (to be replaced by %s-%s)",
 											alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg),
 											alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
 					}
@@ -182,7 +183,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 	/* check for "recommended" package replacements */
 	if(find_replacements(trans, db_local, dbs_sync) == 0) {
 		/* match installed packages with the sync dbs and compare versions */
-		_alpm_log(PM_LOG_DEBUG, _("checking for package upgrades"));
+		_alpm_log(PM_LOG_DEBUG, "checking for package upgrades");
 		for(i = _alpm_db_get_pkgcache(db_local); i; i = i->next) {
 			int replace=0;
 			pmpkg_t *local = i->data;
@@ -193,7 +194,8 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 				spkg = _alpm_db_get_pkgfromcache(j->data, alpm_pkg_get_name(local));
 			}
 			if(spkg == NULL) {
-				_alpm_log(PM_LOG_DEBUG, _("'%s' not found in sync db -- skipping"), alpm_pkg_get_name(local));
+				_alpm_log(PM_LOG_DEBUG, "'%s' not found in sync db -- skipping",
+						alpm_pkg_get_name(local));
 				continue;
 			}
 
@@ -207,14 +209,14 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 				}
 			}
 			if(replace) {
-				_alpm_log(PM_LOG_DEBUG, _("'%s' is already elected for removal -- skipping"),
+				_alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping",
 									alpm_pkg_get_name(local));
 				continue;
 			}
 
 			/* compare versions and see if we need to upgrade */
 			if(alpm_pkg_compare_versions(local, spkg)) {
-				_alpm_log(PM_LOG_DEBUG, _("%s-%s elected for upgrade (%s => %s)"),
+				_alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (%s => %s)",
 									alpm_pkg_get_name(local), alpm_pkg_get_version(local),
 									alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
 				if(!_alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg))) {
@@ -269,7 +271,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 	if(targ) {
 		*targ = '\0';
 		targ++;
-		_alpm_log(PM_LOG_DEBUG, _("searching for target in repo '%s'"), targ);
+		_alpm_log(PM_LOG_DEBUG, "searching for target in repo '%s'", targ);
 		for(j = dbs_sync; j && !spkg; j = j->next) {
 			pmdb_t *db = j->data;
 			if(strcmp(db->treename, targline) == 0) {
@@ -277,12 +279,12 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 				spkg = _alpm_db_get_pkgfromcache(db, targ);
 				if(spkg == NULL) {
 					/* Search provides */
-					_alpm_log(PM_LOG_DEBUG, _("target '%s' not found -- looking for provisions"), targ);
+					_alpm_log(PM_LOG_DEBUG, "target '%s' not found -- looking for provisions", targ);
 					alpm_list_t *p = _alpm_db_whatprovides(db, targ);
 					if(!p) {
 						RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
 					}
-					_alpm_log(PM_LOG_DEBUG, _("found '%s' as a provision for '%s'"), p->data, targ);
+					_alpm_log(PM_LOG_DEBUG, "found '%s' as a provision for '%s'", p->data, targ);
 					spkg = _alpm_db_get_pkgfromcache(db, p->data);
 					alpm_list_free(p);
 				}
@@ -300,12 +302,12 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 		}
 		if(spkg == NULL) {
 			/* Search provides */
-			_alpm_log(PM_LOG_DEBUG, _("target '%s' not found -- looking for provisions"), targ);
+			_alpm_log(PM_LOG_DEBUG, "target '%s' not found -- looking for provisions", targ);
 			for(j = dbs_sync; j && !spkg; j = j->next) {
 				pmdb_t *db = j->data;
 				alpm_list_t *p = _alpm_db_whatprovides(db, targ);
 				if(p) {
-					_alpm_log(PM_LOG_DEBUG, _("found '%s' as a provision for '%s'"), p->data, targ);
+					_alpm_log(PM_LOG_DEBUG, "found '%s' as a provision for '%s'", p->data, targ);
 					spkg = _alpm_db_get_pkgfromcache(db, p->data);
 					alpm_list_free(p);
 				}
@@ -353,7 +355,7 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 			_alpm_pkg_free(dummy);
 			RET_ERR(PM_ERR_MEMORY, -1);
 		}
-		_alpm_log(PM_LOG_DEBUG, _("adding target '%s' to the transaction set"),
+		_alpm_log(PM_LOG_DEBUG, "adding target '%s' to the transaction set",
 							alpm_pkg_get_name(spkg));
 		trans->packages = alpm_list_add(trans->packages, sync);
 	}
@@ -400,7 +402,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 	if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) {
 		/* Resolve targets dependencies */
 		EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL);
-		_alpm_log(PM_LOG_DEBUG, _("resolving target's dependencies"));
+		_alpm_log(PM_LOG_DEBUG, "resolving target's dependencies");
 		for(i = trans->packages; i; i = i->next) {
 			pmpkg_t *spkg = ((pmsyncpkg_t *)i->data)->pkg;
 			if(_alpm_resolvedeps(db_local, dbs_sync, spkg, list,
@@ -421,7 +423,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 					goto cleanup;
 				}
 				trans->packages = alpm_list_add(trans->packages, sync);
-				_alpm_log(PM_LOG_DEBUG, _("adding package %s-%s to the transaction targets"),
+				_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets",
 									alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
 			} else {
 				/* remove the original targets from the list if requested */
@@ -461,7 +463,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);
 
-		_alpm_log(PM_LOG_DEBUG, _("looking for unresolvable dependencies"));
+		_alpm_log(PM_LOG_DEBUG, "looking for unresolvable dependencies");
 		deps = _alpm_checkdeps(db_local, PM_TRANS_TYPE_UPGRADE, list);
 		if(deps) {
 			if(data) {
@@ -481,7 +483,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 		/* check for inter-conflicts and whatnot */
 		EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL);
 
-		_alpm_log(PM_LOG_DEBUG, _("looking for conflicts"));
+		_alpm_log(PM_LOG_DEBUG, "looking for conflicts");
 		deps = _alpm_checkconflicts(db_local, list);
 		if(deps) {
 			int errorout = 0;
@@ -492,7 +494,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 				pmsyncpkg_t *sync;
 				pmpkg_t *found = NULL;
 
-				_alpm_log(PM_LOG_DEBUG, _("package '%s' conflicts with '%s'"),
+				_alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'",
 				          miss->target, miss->depend.name);
 				/* check if the conflicting package is about to be removed/replaced.
 				 * if so, then just ignore it. */
@@ -503,14 +505,14 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 					}
 				}
 				if(found) {
-					_alpm_log(PM_LOG_DEBUG, _("'%s' is already elected for removal -- skipping"),
+					_alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping",
 							alpm_pkg_get_name(found));
 					continue;
 				}
 
 				sync = _alpm_sync_find(trans->packages, miss->target);
 				if(sync == NULL) {
-					_alpm_log(PM_LOG_DEBUG, _("'%s' not found in transaction set -- skipping"),
+					_alpm_log(PM_LOG_DEBUG, "'%s' not found in transaction set -- skipping",
 					          miss->target);
 					continue;
 				}
@@ -520,7 +522,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 							miss->depend.name)) {
 					/* treat like a replaces item so requiredby fields are
 					 * inherited properly. */
-					_alpm_log(PM_LOG_DEBUG, _("package '%s' provides its own conflict"),
+					_alpm_log(PM_LOG_DEBUG, "package '%s' provides its own conflict",
 							miss->target);
 					if(!local) {
 						char *rmpkg = NULL;
@@ -541,12 +543,12 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 						target = alpm_list_find_str(trans->targets, miss->target);
 						depend = alpm_list_find_str(trans->targets, miss->depend.name);
 						if(depend && !target) {
-							_alpm_log(PM_LOG_DEBUG, _("'%s' is in the target list -- keeping it"),
+							_alpm_log(PM_LOG_DEBUG, "'%s' is in the target list -- keeping it",
 								miss->depend.name);
 							/* remove miss->target */
 							rmpkg = miss->target;
 						} else if(target && !depend) {
-							_alpm_log(PM_LOG_DEBUG, _("'%s' is in the target list -- keeping it"),
+							_alpm_log(PM_LOG_DEBUG, "'%s' is in the target list -- keeping it",
 								miss->target);
 							/* remove miss->depend.name */
 							rmpkg = miss->depend.name;
@@ -558,7 +560,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 						if(rmpkg) {
 							pmsyncpkg_t *rsync = _alpm_sync_find(trans->packages, rmpkg);
 							void *vpkg;
-							_alpm_log(PM_LOG_DEBUG, _("removing '%s' from target list"),
+							_alpm_log(PM_LOG_DEBUG, "removing '%s' from target list",
 									rsync->pkg->name);
 							trans->packages = alpm_list_remove(trans->packages, rsync,
 									syncpkg_cmp, &vpkg);
@@ -568,7 +570,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 					}
 				}
 				/* It's a conflict -- see if they want to remove it */
-				_alpm_log(PM_LOG_DEBUG, _("resolving package '%s' conflict"),
+				_alpm_log(PM_LOG_DEBUG, "resolving package '%s' conflict",
 						miss->target);
 				if(local) {
 					int doremove = 0;
@@ -586,7 +588,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 								sync->data = NULL;
 							}
 							/* append to the replaces list */
-							_alpm_log(PM_LOG_DEBUG, _("electing '%s' for removal"),
+							_alpm_log(PM_LOG_DEBUG, "electing '%s' for removal",
 									miss->depend.name);
 							sync->data = alpm_list_add(sync->data, q);
 							/* see if the package is in the current target list */
@@ -595,7 +597,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 							if(rsync) {
 								/* remove it from the target list */
 								void *vpkg;
-								_alpm_log(PM_LOG_DEBUG, _("removing '%s' from target list"),
+								_alpm_log(PM_LOG_DEBUG, "removing '%s' from target list",
 										miss->depend.name);
 								trans->packages = alpm_list_remove(trans->packages, rsync,
 										syncpkg_cmp, &vpkg);
@@ -672,7 +674,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 			}
 		}
 		if(list) {
-			_alpm_log(PM_LOG_DEBUG, _("checking dependencies of packages designated for removal"));
+			_alpm_log(PM_LOG_DEBUG, "checking dependencies of packages designated for removal");
 			deps = _alpm_checkdeps(db_local, PM_TRANS_TYPE_REMOVE, list);
 			if(deps) {
 				/* Check if broken dependencies are fixed by packages we are installing */
@@ -686,7 +688,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 						pmsyncpkg_t *sp = l->data;
 						pmpkg_t *sppkg = sp->pkg;
 						if(alpm_depcmp(sppkg, &(miss->depend))) {
-							_alpm_log(PM_LOG_DEBUG, _("sync: dependency '%s' satisfied by package '%s'"),
+							_alpm_log(PM_LOG_DEBUG, "sync: dependency '%s' satisfied by package '%s'",
 									miss->depend.name, alpm_pkg_get_name(sppkg));
 							satisfied = 1;
 						}
@@ -753,7 +755,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 						         fname);
 						if(stat(path, &buf) == 0) {
 							found = 1;
-							_alpm_log(PM_LOG_DEBUG, _("found cached pkg: %s"), path);
+							_alpm_log(PM_LOG_DEBUG, "found cached pkg: %s", path);
 							break;
 						}
 					}
@@ -778,13 +780,13 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 					alpm_logaction("warning: no %s cache exists, creating...",
 							cachedir);
 					if(_alpm_makepath(cachedir) == 0) {
-						_alpm_log(PM_LOG_DEBUG, _("setting main cachedir: %s"), cachedir);
+						_alpm_log(PM_LOG_DEBUG, "setting main cachedir: %s", cachedir);
 						maincachedir = cachedir;
 						validcache = 1;
 						break;
 					}
 				} else if(S_ISDIR(buf.st_mode) && (buf.st_mode & S_IWUSR)) {
-					_alpm_log(PM_LOG_DEBUG, _("setting main cachedir: %s"), cachedir);
+					_alpm_log(PM_LOG_DEBUG, "setting main cachedir: %s", cachedir);
 					maincachedir = cachedir;
 					validcache = 1;
 					break;
@@ -797,7 +799,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 				alpm_list_t *cachetmp = alpm_list_add(NULL, strdup("/tmp/"));
 				FREELIST(oldcachedirs);
 				alpm_option_set_cachedirs(cachetmp);
-					_alpm_log(PM_LOG_DEBUG, _("setting main cachedir: %s"), "/tmp/");
+					_alpm_log(PM_LOG_DEBUG, "setting main cachedir: %s", "/tmp/");
 				maincachedir = alpm_list_getdata(cachetmp);
 				_alpm_log(PM_LOG_WARNING, _("couldn't create package cache, using /tmp instead"));
 				alpm_logaction("warning: couldn't create package cache, using /tmp instead");
@@ -844,7 +846,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 		for(j = alpm_option_get_cachedirs(); j; j = alpm_list_next(j)) {
 			snprintf(str, PATH_MAX, "%s%s", (char*)alpm_list_getdata(j), pkgname);
 			if(stat(str, &buf) == 0) {
-				_alpm_log(PM_LOG_DEBUG, _("package found for integrity check: %s"),
+				_alpm_log(PM_LOG_DEBUG, "package found for integrity check: %s",
 						str);
 				break;
 			}
@@ -922,7 +924,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 		}
 	}
 	if(replaces) {
-		_alpm_log(PM_LOG_DEBUG, _("removing conflicting and to-be-replaced packages"));
+		_alpm_log(PM_LOG_DEBUG, "removing conflicting and to-be-replaced packages");
 		if(_alpm_trans_prepare(tr, data) == -1) {
 			_alpm_log(PM_LOG_ERROR, _("could not prepare removal transaction"));
 			goto error;
@@ -938,7 +940,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 	tr = NULL;
 
 	/* install targets */
-	_alpm_log(PM_LOG_DEBUG, _("installing packages"));
+	_alpm_log(PM_LOG_DEBUG, "installing packages");
 	tr = _alpm_trans_new();
 	if(tr == NULL) {
 		_alpm_log(PM_LOG_ERROR, _("could not create transaction"));
@@ -988,7 +990,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 
 	/* propagate replaced packages' requiredby fields to their new owners */
 	if(replaces) {
-		_alpm_log(PM_LOG_DEBUG, _("updating database for replaced packages' dependencies"));
+		_alpm_log(PM_LOG_DEBUG, "updating database for replaced packages' dependencies");
 		for(i = trans->packages; i; i = i->next) {
 			pmsyncpkg_t *sync = i->data;
 			if(sync->type == PM_SYNC_TYPE_REPLACE) {
@@ -1042,7 +1044,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 
 	/* run ldconfig if it exists */
 	if(handle->trans->state != STATE_INTERRUPTED) {
-		_alpm_log(PM_LOG_DEBUG, _("running \"ldconfig -r %s\""), handle->root);
+		_alpm_log(PM_LOG_DEBUG, "running \"ldconfig -r %s\"", handle->root);
 		_alpm_ldconfig(handle->root);
 	}
 
@@ -1067,13 +1069,13 @@ pmsyncpkg_t *_alpm_sync_find(alpm_list_t *syncpkgs, const char* pkgname)
 
 		pmpkg_t *pkg = alpm_sync_get_pkg(syncpkg);
 		if(strcmp(alpm_pkg_get_name(pkg), pkgname) == 0) {
-			_alpm_log(PM_LOG_DEBUG, _("found package '%s-%s' in sync"),
+			_alpm_log(PM_LOG_DEBUG, "found package '%s-%s' in sync",
 								alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
 			return(syncpkg);
 		}
 	}
 
-	_alpm_log(PM_LOG_DEBUG, _("package '%s' not found in sync"), pkgname);
+	_alpm_log(PM_LOG_DEBUG, "package '%s' not found in sync", pkgname);
 	return(NULL); /* not found */
 }