Hi,

I have attached a patch to change a little bit what messages are
printed when creating a ".pacnew" file.

Regards
--
Boris 'billiob' Faure

On Mon, Feb 28, 2011 at 12:35 PM, Boris 'billiob' Faure
<billiob@gmail.com> wrote:
> Hi,
>
> I have attached a patch to change a little bit what messages are
> printed when creating a ".pacnew" file.

Inline patches (using git send-email if necessary) please.

-Dan

---
lib/libalpm/add.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 702b12e..db5ee74 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -401,14 +401,14 @@ static int extract_single_file(struct archive *archive,
" new one with .pacnew ending
");
snprintf(newpath, PATH_MAX, "%s.pacnew", filename);
if(rename(checkfile, newpath)) {
- _alpm_log(PM_LOG_ERROR, _("could not install %s as %s (%s)
"),
+ _alpm_log(PM_LOG_ERROR, _("could not install new %s as %s (%s)
"),
filename, newpath, strerror(errno));
- alpm_logaction("error: could not install %s as %s (%s)
",
+ alpm_logaction("error: could not install new %s as %s (%s)
",
filename, newpath, strerror(errno));
} else {
- _alpm_log(PM_LOG_WARNING, _("%s installed as %s
"),
+ _alpm_log(PM_LOG_WARNING, _("new %s installed as %s
"),
filename, newpath);
- alpm_logaction("warning: %s installed as %s
",
+ alpm_logaction("warning: new %s installed as %s
",
filename, newpath);
}
}
--
1.7.4.1

On Mon, Feb 28, 2011 at 9:18 PM, Boris 'billiob' Faure
<billiob@gmail.com> wrote:
> ---
> *lib/libalpm/add.c | * *8 ++++----
> *1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
> index 702b12e..db5ee74 100644
> --- a/lib/libalpm/add.c
> +++ b/lib/libalpm/add.c
> @@ -401,14 +401,14 @@ static int extract_single_file(struct archive *archive,
> * * * * * * * * * * * * * * * * * * * * * * * *" new one with .pacnew ending
");
> * * * * * * * * * * * * * * * *snprintf(newpath, PATH_MAX, "%s.pacnew", filename);
> * * * * * * * * * * * * * * * *if(rename(checkfile, newpath)) {
> - * * * * * * * * * * * * * * * * * * * _alpm_log(PM_LOG_ERROR, _("could not install %s as %s (%s)
"),
> + * * * * * * * * * * * * * * * * * * * _alpm_log(PM_LOG_ERROR, _("could not install new %s as %s (%s)
"),
> * * * * * * * * * * * * * * * * * * * * * * * * * * * *filename, newpath, strerror(errno));
> - * * * * * * * * * * * * * * * * * * * alpm_logaction("error: could not install %s as %s (%s)
",
> + * * * * * * * * * * * * * * * * * * * alpm_logaction("error: could not install new %s as %s (%s)
",
> * * * * * * * * * * * * * * * * * * * * * * * * * * * *filename, newpath, strerror(errno));
> * * * * * * * * * * * * * * * *} else {
> - * * * * * * * * * * * * * * * * * * * _alpm_log(PM_LOG_WARNING, _("%s installed as %s
"),
> + * * * * * * * * * * * * * * * * * * * _alpm_log(PM_LOG_WARNING, _("new %s installed as %s
"),
> * * * * * * * * * * * * * * * * * * * * * * * * * * * *filename, newpath);
> - * * * * * * * * * * * * * * * * * * * alpm_logaction("warning: %s installed as %s
",
> + * * * * * * * * * * * * * * * * * * * alpm_logaction("warning: new %s installed as %s
",
> * * * * * * * * * * * * * * * * * * * * * * * * * * * *filename, newpath);
> * * * * * * * * * * * * * * * *}
> * * * * * * * * * * * *}

We both aren't native english speakers, but Dan is and here's what he
had to say :

Dan: sounds awful to me in english
"%s from new package installed as" or something seems better

On Tue, Mar 1, 2011 at 5:11 PM, Xavier Chantry <chantry.xavier@gmail.com> wrote:
> On Mon, Feb 28, 2011 at 9:18 PM, Boris 'billiob' Faure
> <billiob@gmail.com> wrote:
>> ---
>> *lib/libalpm/add.c | * *8 ++++----
>> *1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
>> index 702b12e..db5ee74 100644
>> --- a/lib/libalpm/add.c
>> +++ b/lib/libalpm/add.c
>> @@ -401,14 +401,14 @@ static int extract_single_file(struct archive *archive,
>> * * * * * * * * * * * * * * * * * * * * * * * *" new one with .pacnew ending
");
>> * * * * * * * * * * * * * * * *snprintf(newpath, PATH_MAX, "%s.pacnew", filename);
>> * * * * * * * * * * * * * * * *if(rename(checkfile, newpath)) {
>> - * * * * * * * * * * * * * * * * * * * _alpm_log(PM_LOG_ERROR, _("could not install %s as %s (%s)
"),
>> + * * * * * * * * * * * * * * * * * * * _alpm_log(PM_LOG_ERROR, _("could not install new %s as %s (%s)
"),
>> * * * * * * * * * * * * * * * * * * * * * * * * * * * *filename, newpath, strerror(errno));
>> - * * * * * * * * * * * * * * * * * * * alpm_logaction("error: could not install %s as %s (%s)
",
>> + * * * * * * * * * * * * * * * * * * * alpm_logaction("error: could not install new %s as %s (%s)
",
>> * * * * * * * * * * * * * * * * * * * * * * * * * * * *filename, newpath, strerror(errno));
>> * * * * * * * * * * * * * * * *} else {
>> - * * * * * * * * * * * * * * * * * * * _alpm_log(PM_LOG_WARNING, _("%s installed as %s
"),
>> + * * * * * * * * * * * * * * * * * * * _alpm_log(PM_LOG_WARNING, _("new %s installed as %s
"),
>> * * * * * * * * * * * * * * * * * * * * * * * * * * * *filename, newpath);
>> - * * * * * * * * * * * * * * * * * * * alpm_logaction("warning: %s installed as %s
",
>> + * * * * * * * * * * * * * * * * * * * alpm_logaction("warning: new %s installed as %s
",
>> * * * * * * * * * * * * * * * * * * * * * * * * * * * *filename, newpath);
>> * * * * * * * * * * * * * * * *}
>> * * * * * * * * * * * *}
>
> We both aren't native english speakers, but Dan is and here's what he
> had to say :
>
> Dan: sounds awful to me in english
> "%s from new package installed as" or something seems better

Whoops, yeah, forgot to respond.

The "what is new" bit was confusing in the changed message, as it was
used as an adjective on the old filename.

-Dan