Advertisement
Guest User

Untitled

a guest
Jul 27th, 2017
54
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.52 KB | None | 0 0
  1. Index: qmerge.c
  2. ===================================================================
  3. RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v
  4. retrieving revision 1.104
  5. diff -u -b -B -r1.104 qmerge.c
  6. --- qmerge.c 24 Feb 2011 01:29:27 -0000 1.104
  7. +++ qmerge.c 24 Feb 2011 01:48:46 -0000
  8. @@ -26,11 +26,12 @@
  9.  
  10. int old_repo = 0;
  11.  
  12. -#define QMERGE_FLAGS "fFsKUpuyO5" COMMON_FLAGS
  13. +#define QMERGE_FLAGS "fFsSKUpuyO5" COMMON_FLAGS
  14. static struct option const qmerge_long_opts[] = {
  15. {"fetch", no_argument, NULL, 'f'},
  16. {"force", no_argument, NULL, 'F'},
  17. {"search", no_argument, NULL, 's'},
  18. + {"rsearch", no_argument, NULL, 'S'},
  19. {"install", no_argument, NULL, 'K'},
  20. {"unmerge", no_argument, NULL, 'U'},
  21. {"pretend", no_argument, NULL, 'p'},
  22. @@ -45,6 +46,7 @@
  23. "Fetch package and newest Packages metadata",
  24. "Fetch package (skipping Packages)",
  25. "Search available packages",
  26. + "Simple search available packages",
  27. "Install package",
  28. "Uninstall package",
  29. "Pretend only",
  30. @@ -103,6 +105,12 @@
  31. int pkg_unmerge(const char *, const char *);
  32. int unlink_empty(char *);
  33. void print_Pkg(int, struct pkg_t *);
  34. +<<<<<<< qmerge.c
  35. +int parse_packages(const char *, int, char **);
  36. +int config_protected(const char *, int, char **);
  37. +int match_pkg(const char *, struct pkg_t *, int flags);
  38. +=======
  39. +>>>>>>> 1.104
  40. int pkg_verify_checksums(char *, struct pkg_t *, depend_atom *, int strict, int display);
  41. char *find_binpkg(const char *);
  42.  
  43. @@ -1111,12 +1119,18 @@
  44. return -1;
  45. }
  46.  
  47. +<<<<<<< qmerge.c
  48. +int match_pkg(const char *name, struct pkg_t *pkg, int flags)
  49. +=======
  50. static int match_pkg(queue *ll, struct pkg_t *pkg)
  51. +>>>>>>> 1.104
  52. {
  53. depend_atom *atom;
  54. char buf[255], buf2[255];
  55. int match = 0;
  56.  
  57. + if (*name == '-')
  58. + return match;
  59. snprintf(buf, sizeof(buf), "%s/%s", pkg->CATEGORY, pkg->PF);
  60. if ((atom = atom_explode(buf)) == NULL)
  61. errf("%s/%s is not a valid atom", pkg->CATEGORY, pkg->PF);
  62. @@ -1136,6 +1150,13 @@
  63. if (strcmp(ll->name, atom->PN) == 0)
  64. match = 4;
  65.  
  66. + /* coding error? this shoud work */
  67. + if (flags >= 2)
  68. + if ((strstr(atom->PN, name)) != NULL) {
  69. + DBG("MATCHING: %s to %s", atom->PN, name);
  70. + match = 5;
  71. + }
  72. +
  73. if (match)
  74. goto match_done;
  75.  
  76. @@ -1207,6 +1228,14 @@
  77. if ((atom = atom_explode(buf)) == NULL)
  78. errf("%s/%s is not a valid atom", pkg->CATEGORY, pkg->PF);
  79.  
  80. +<<<<<<< qmerge.c
  81. + for (i = 1; i < argc; i++) {
  82. + if (argv[i][0] == '-')
  83. + continue;
  84. + /* verify this is the requested package */
  85. + if (match_pkg(argv[i], pkg, search_pkgs) < 1)
  86. + continue;
  87. +=======
  88. ll = todo;
  89. while (ll) {
  90. if (ll->name[0] != '-' && match_pkg(ll, pkg)) {
  91. @@ -1216,6 +1245,7 @@
  92.  
  93. ll = ll->next;
  94. }
  95. +>>>>>>> 1.104
  96.  
  97. /* free the atom */
  98. atom_implode(atom);
  99. @@ -1593,10 +1623,16 @@
  100. *pkg = Pkg;
  101.  
  102. if (search_pkgs) {
  103. +<<<<<<< qmerge.c
  104. + if (argc != optind) {
  105. + for (i = 0; i < argc; i++)
  106. + if ((match_pkg(argv[i], pkg, search_pkgs) > 0) || (strcmp(argv[i], pkg->CATEGORY) == 0))
  107. +=======
  108. if (todo) {
  109. queue *ll = todo;
  110. while (ll) {
  111. if ((match_pkg(ll, pkg) > 0) || (strcmp(ll->name, pkg->CATEGORY) == 0))
  112. +>>>>>>> 1.104
  113. print_Pkg(verbose, pkg);
  114. ll = ll->next;
  115. }
  116. @@ -1753,6 +1789,7 @@
  117. case 'f': force_download = 1; break;
  118. case 'F': force_download = 2; break;
  119. case 's': search_pkgs = 1; break;
  120. + case 'S': search_pkgs = 2; break;
  121. /* case 'i': case 'g': */
  122. case 'K': install = 1; break;
  123. case 'U': uninstall = 1; break;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement