Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: qmerge.c
- ===================================================================
- RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v
- retrieving revision 1.104
- diff -u -b -B -r1.104 qmerge.c
- --- qmerge.c 24 Feb 2011 01:29:27 -0000 1.104
- +++ qmerge.c 24 Feb 2011 01:48:46 -0000
- @@ -26,11 +26,12 @@
- int old_repo = 0;
- -#define QMERGE_FLAGS "fFsKUpuyO5" COMMON_FLAGS
- +#define QMERGE_FLAGS "fFsSKUpuyO5" COMMON_FLAGS
- static struct option const qmerge_long_opts[] = {
- {"fetch", no_argument, NULL, 'f'},
- {"force", no_argument, NULL, 'F'},
- {"search", no_argument, NULL, 's'},
- + {"rsearch", no_argument, NULL, 'S'},
- {"install", no_argument, NULL, 'K'},
- {"unmerge", no_argument, NULL, 'U'},
- {"pretend", no_argument, NULL, 'p'},
- @@ -45,6 +46,7 @@
- "Fetch package and newest Packages metadata",
- "Fetch package (skipping Packages)",
- "Search available packages",
- + "Simple search available packages",
- "Install package",
- "Uninstall package",
- "Pretend only",
- @@ -103,6 +105,12 @@
- int pkg_unmerge(const char *, const char *);
- int unlink_empty(char *);
- void print_Pkg(int, struct pkg_t *);
- +<<<<<<< qmerge.c
- +int parse_packages(const char *, int, char **);
- +int config_protected(const char *, int, char **);
- +int match_pkg(const char *, struct pkg_t *, int flags);
- +=======
- +>>>>>>> 1.104
- int pkg_verify_checksums(char *, struct pkg_t *, depend_atom *, int strict, int display);
- char *find_binpkg(const char *);
- @@ -1111,12 +1119,18 @@
- return -1;
- }
- +<<<<<<< qmerge.c
- +int match_pkg(const char *name, struct pkg_t *pkg, int flags)
- +=======
- static int match_pkg(queue *ll, struct pkg_t *pkg)
- +>>>>>>> 1.104
- {
- depend_atom *atom;
- char buf[255], buf2[255];
- int match = 0;
- + if (*name == '-')
- + return match;
- snprintf(buf, sizeof(buf), "%s/%s", pkg->CATEGORY, pkg->PF);
- if ((atom = atom_explode(buf)) == NULL)
- errf("%s/%s is not a valid atom", pkg->CATEGORY, pkg->PF);
- @@ -1136,6 +1150,13 @@
- if (strcmp(ll->name, atom->PN) == 0)
- match = 4;
- + /* coding error? this shoud work */
- + if (flags >= 2)
- + if ((strstr(atom->PN, name)) != NULL) {
- + DBG("MATCHING: %s to %s", atom->PN, name);
- + match = 5;
- + }
- +
- if (match)
- goto match_done;
- @@ -1207,6 +1228,14 @@
- if ((atom = atom_explode(buf)) == NULL)
- errf("%s/%s is not a valid atom", pkg->CATEGORY, pkg->PF);
- +<<<<<<< qmerge.c
- + for (i = 1; i < argc; i++) {
- + if (argv[i][0] == '-')
- + continue;
- + /* verify this is the requested package */
- + if (match_pkg(argv[i], pkg, search_pkgs) < 1)
- + continue;
- +=======
- ll = todo;
- while (ll) {
- if (ll->name[0] != '-' && match_pkg(ll, pkg)) {
- @@ -1216,6 +1245,7 @@
- ll = ll->next;
- }
- +>>>>>>> 1.104
- /* free the atom */
- atom_implode(atom);
- @@ -1593,10 +1623,16 @@
- *pkg = Pkg;
- if (search_pkgs) {
- +<<<<<<< qmerge.c
- + if (argc != optind) {
- + for (i = 0; i < argc; i++)
- + if ((match_pkg(argv[i], pkg, search_pkgs) > 0) || (strcmp(argv[i], pkg->CATEGORY) == 0))
- +=======
- if (todo) {
- queue *ll = todo;
- while (ll) {
- if ((match_pkg(ll, pkg) > 0) || (strcmp(ll->name, pkg->CATEGORY) == 0))
- +>>>>>>> 1.104
- print_Pkg(verbose, pkg);
- ll = ll->next;
- }
- @@ -1753,6 +1789,7 @@
- case 'f': force_download = 1; break;
- case 'F': force_download = 2; break;
- case 's': search_pkgs = 1; break;
- + case 'S': search_pkgs = 2; break;
- /* case 'i': case 'g': */
- case 'K': install = 1; break;
- case 'U': uninstall = 1; break;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement