mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
* Bugfix FS#6422 - spacing for warning output. Due to the fact that we fixed
MSG/ERR usage earlier, the trailing '\n's are no longer needed * Oddly enough - *ADDED* some '\n's to the sync_info errors (last commit) as the package info output does not use the pm_fprintf facility and thus does not honor our newline/no-newline setup
This commit is contained in:
parent
4b2e236a35
commit
17e72ff882
@ -89,12 +89,12 @@ void cb_log(unsigned short level, char *msg)
|
|||||||
strftime(timestr, 9, "%H:%M:%S", tmp);
|
strftime(timestr, 9, "%H:%M:%S", tmp);
|
||||||
timestr[8] = '\0';
|
timestr[8] = '\0';
|
||||||
|
|
||||||
MSG(NL, "[%s] %s: %s\n", timestr, str, msg);
|
MSG(NL, "[%s] %s: %s", timestr, str, msg);
|
||||||
} else {
|
} else {
|
||||||
MSG(NL, "%s: %s\n", str, msg);
|
MSG(NL, "%s: %s", str, msg);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
MSG(NL, "%s: %s\n", str, msg);
|
MSG(NL, "%s: %s", str, msg);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -340,7 +340,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!db) {
|
if(!db) {
|
||||||
ERR(NL, _("repository '%s' does not exist"), repo);
|
ERR(NL, _("repository '%s' does not exist\n"), repo);
|
||||||
return(1);
|
return(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -356,7 +356,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!foundpkg) {
|
if(!foundpkg) {
|
||||||
ERR(NL, _("package '%s' was not found in repository '%s'"), pkgstr, repo);
|
ERR(NL, _("package '%s' was not found in repository '%s'\n"), pkgstr, repo);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
pkgstr = target;
|
pkgstr = target;
|
||||||
@ -376,7 +376,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!foundpkg) {
|
if(!foundpkg) {
|
||||||
ERR(NL, _("package '%s' was not found."), pkgstr);
|
ERR(NL, _("package '%s' was not found\n"), pkgstr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user