[PATCH] Show install status during file search

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] Show install status during file search

morganamilo
When doing "pacman -Fs", show the "[installed: version]"
message just like "pacman -Ss".

Signed-off-by: morganamilo <[hidden email]>
---
 src/pacman/files.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pacman/files.c b/src/pacman/files.c
index d7fc5446..65e6ad26 100644
--- a/src/pacman/files.c
+++ b/src/pacman/files.c
@@ -101,6 +101,7 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) {
 
 static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
  int ret = 0;
+ alpm_db_t *db_local = alpm_get_localdb(config->handle);
  alpm_list_t *t;
  const colstr_t *colstr = &config->colstr;
 
@@ -157,13 +158,15 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
  printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg));
  } else {
  alpm_list_t *ml;
- printf("%s%s/%s%s %s%s%s\n", colstr->repo, alpm_db_get_name(repo),
+ printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(repo),
  colstr->title, alpm_pkg_get_name(pkg),
  colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor);
 
+ print_installed(db_local, pkg);
+
  for(ml = match; ml; ml = alpm_list_next(ml)) {
  c = ml->data;
- printf("    %s\n", c);
+ printf("\n    %s\n", c);
  }
  }
  alpm_list_free(match);
--
2.17.1
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Show install status during file search

Allan McRae
On 12/06/18 06:17, morganamilo wrote:
> When doing "pacman -Fs", show the "[installed: version]"
> message just like "pacman -Ss".
>
> Signed-off-by: morganamilo <[hidden email]>
> ---


Something not quite right here.   Note I have pacman-git installed.

allan@kamala ~/arch/code/pacman (patchqueue)
$ ./src/pacman/pacman -Fs pacman
core/pacman 5.1.1-1
    usr/bin/pacman

    usr/share/bash-completion/completions/pacman
extra/xscreensaver 5.39-1
    usr/lib/xscreensaver/pacman

allan@kamala ~/arch/code/pacman (patchqueue)
$ pacman -Fs pacman
core/pacman 5.1.1-1
    usr/bin/pacman
    usr/share/bash-completion/completions/pacman
extra/xscreensaver 5.39-1
    usr/lib/xscreensaver/pacman




>  src/pacman/files.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/src/pacman/files.c b/src/pacman/files.c
> index d7fc5446..65e6ad26 100644
> --- a/src/pacman/files.c
> +++ b/src/pacman/files.c
> @@ -101,6 +101,7 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) {
>  
>  static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
>   int ret = 0;
> + alpm_db_t *db_local = alpm_get_localdb(config->handle);
>   alpm_list_t *t;
>   const colstr_t *colstr = &config->colstr;
>  
> @@ -157,13 +158,15 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
>   printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg));
>   } else {
>   alpm_list_t *ml;
> - printf("%s%s/%s%s %s%s%s\n", colstr->repo, alpm_db_get_name(repo),
> + printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(repo),
>   colstr->title, alpm_pkg_get_name(pkg),
>   colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor);
>  
> + print_installed(db_local, pkg);
> +
>   for(ml = match; ml; ml = alpm_list_next(ml)) {
>   c = ml->data;
> - printf("    %s\n", c);
> + printf("\n    %s\n", c);
>   }
>   }
>   alpm_list_free(match);
>
Reply | Threaded
Open this post in threaded view
|

[PATCH v2] Show install status during file search

morganamilo
When doing "pacman -Fs", show the "[installed: version]"
message just like "pacman -Ss".

Signed-off-by: morganamilo <[hidden email]>
---

Fixed extra \n's

diff --git a/src/pacman/files.c b/src/pacman/files.c
index d7fc5446..58cf8d3d 100644
--- a/src/pacman/files.c
+++ b/src/pacman/files.c
@@ -101,6 +101,7 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) {
 
 static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
  int ret = 0;
+ alpm_db_t *db_local = alpm_get_localdb(config->handle);
  alpm_list_t *t;
  const colstr_t *colstr = &config->colstr;
 
@@ -157,10 +158,13 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
  printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg));
  } else {
  alpm_list_t *ml;
- printf("%s%s/%s%s %s%s%s\n", colstr->repo, alpm_db_get_name(repo),
+ printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(repo),
  colstr->title, alpm_pkg_get_name(pkg),
  colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor);
 
+ print_installed(db_local, pkg);
+ printf("\n");
+
  for(ml = match; ml; ml = alpm_list_next(ml)) {
  c = ml->data;
  printf("    %s\n", c);
--
2.18.0
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v2] Show install status during file search

Allan McRae
On 17/08/18 14:41, morganamilo wrote:
> When doing "pacman -Fs", show the "[installed: version]"
> message just like "pacman -Ss".
>
> Signed-off-by: morganamilo <[hidden email]>
> ---
>
> Fixed extra \n's
>

Great - this version looks good to me.

A