diff options
| author | Judd Vinet <judd@archlinux.org> | 2005-10-20 20:34:31 +0000 |
|---|---|---|
| committer | Judd Vinet <judd@archlinux.org> | 2005-10-20 20:34:31 +0000 |
| commit | 958f7ee86037ce42d9de3fdc9f7f25b9a2e1ff6c (patch) | |
| tree | d830024aa51d85083b7a095744e7a7669a409794 /src/pacman/sync.c | |
| parent | 3929450d62d3e267fdd43413cdfaee86160e819a (diff) | |
remove dupes from group lists in sync
Diffstat (limited to 'src/pacman/sync.c')
| -rw-r--r-- | src/pacman/sync.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 9d741c48..5fab26b3 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -474,22 +474,28 @@ int pacman_sync(list_t *targets) sync_t *sync = j->data; grp = alpm_db_readgrp(sync->db, targ); if(grp) { - PM_LIST *k, *pkgs; + PM_LIST *pmpkgs; + list_t *k, *pkgs; MSG(NL, ":: group %s:\n", targ); - pkgs = alpm_grp_getinfo(grp, PM_GRP_PKGNAMES); - PM_LIST_display(" ", pkgs); + pmpkgs = alpm_grp_getinfo(grp, PM_GRP_PKGNAMES); + /* remove dupe entries in case a package exists in multiple repos */ + /* (the dupe function takes a PM_LIST* and returns a list_t*) */ + pkgs = PM_LIST_remove_dupes(pmpkgs); + /* */ + list_display(" ", pkgs); if(yesno(":: Install whole content? [Y/n] ")) { - for(k = alpm_list_first(pkgs); k; k = alpm_list_next(k)) { - targets = list_add(targets, strdup(alpm_list_getdata(k))); + for(k = pkgs; k; k = k->next) { + targets = list_add(targets, strdup(k->data)); } } else { - for(k = alpm_list_first(pkgs); k; k = alpm_list_next(k)) { - char *pkgname = alpm_list_getdata(k); + for(k = pkgs; k; k = k->next) { + char *pkgname = k->data; if(yesno(":: Install %s from group %s? [Y/n] ", pkgname, targ)) { targets = list_add(targets, strdup(pkgname)); } } } + FREELIST(pkgs); } } if(grp == NULL) { |