summaryrefslogtreecommitdiffstats
path: root/bin/emerge
Commit message (Collapse)AuthorAgeFilesLines
...
* For bug #180079, fix a KeyError so that a search for the empty string will ↵Zac Medico2007-05-281-2/+2
| | | | | | go ahead and match all packages. (trunk r6648) svn path=/main/branches/2.1.2/; revision=6649
* In --tree output, keep track of which graph edges have already been ↵Zac Medico2007-05-231-0/+9
| | | | | | displayed and try not to display a given edge more than once. (trunk r6555:6557) svn path=/main/branches/2.1.2/; revision=6604
* Prevent blockers that are only partially resolvable by merge order from ↵v2.1.2.7Zac Medico2007-05-071-1/+10
| | | | | | accidentally being ignored. (trunk r6493:6494) svn path=/main/branches/2.1.2/; revision=6495
* Use shlex for better splitting of PORTAGE_RSYNC_OPTS and ↵Zac Medico2007-05-061-9/+15
| | | | | | PORTAGE_RSYNC_EXTRA_OPTS. (trunk r6491:6492) svn path=/main/branches/2.1.2/; revision=6493
* Use match_from_list in order to potentially avoid more blocks. (trunk ↵Zac Medico2007-05-051-10/+10
| | | | | | r6481:6482) svn path=/main/branches/2.1.2/; revision=6483
* For bug #176765, when a new package is blocked by another one that is being ↵Zac Medico2007-05-031-3/+17
| | | | | | replaced, handle another case where the conflict can be avoided. (trunk r6472:6473) svn path=/main/branches/2.1.2/; revision=6474
* For bug #176384, adjust config according to options of the command being ↵Zac Medico2007-04-281-0/+9
| | | | | | resumed. (trunk r6453:6454) svn path=/main/branches/2.1.2/; revision=6455
* Fix up missing mymergelist variable from the previous commit. (trunk r6445:6446)Zac Medico2007-04-281-5/+6
| | | | svn path=/main/branches/2.1.2/; revision=6447
* For bug #176305, validate the resume merge list before attempting to verify ↵Zac Medico2007-04-281-12/+13
| | | | | | the ebuild manifests. (trunk r6443:6444) svn path=/main/branches/2.1.2/; revision=6445
* For bug #175344, handle a potential InvalidDependString exception when ↵Zac Medico2007-04-201-2/+8
| | | | | | parsing PROVIDE. (trunk r6418:6419) svn path=/main/branches/2.1.2/; revision=6420
* For bug #175344, use cp_list instead of xmatch in order to avoid dep_expand ↵Zac Medico2007-04-201-1/+1
| | | | | | calls. (trunk r6416:6417) svn path=/main/branches/2.1.2/; revision=6418
* Punt the sorted_versions() function in favor of list.sort(vercmp). (trunk ↵Zac Medico2007-04-051-32/+7
| | | | | | r6338:6339) svn path=/main/branches/2.1.2/; revision=6340
* For bug #172571, use socket.AF_INET as the default family for ↵v2.1.2.3Zac Medico2007-03-281-1/+1
| | | | | | socket.getaddrinfo(). (trunk r6320:6321) svn path=/main/branches/2.1.2/; revision=6322
* Correctly pull the metadata again when the node is converted. (trunk r6306:6307)Zac Medico2007-03-281-5/+6
| | | | svn path=/main/branches/2.1.2/; revision=6308
* Convert "ebuild" and "binary" "nomerge" nodes into "installed" nodes for ↵Zac Medico2007-03-281-0/+3
| | | | | | greater consistency in the depgraph. (trunk r6304:6305) svn path=/main/branches/2.1.2/; revision=6306
* Verify the Manifest first even if there's only one package (prior to the ↵Zac Medico2007-03-251-1/+0
| | | | | | fetch phase). (trunk r6282:6283) svn path=/main/branches/2.1.2/; revision=6284
* Verify all ebuild manifests before building anything now so that the user is ↵Zac Medico2007-03-241-0/+29
| | | | | | notified of failure as soon as possible. (trunk r6276:6277) svn path=/main/branches/2.1.2/; revision=6278
* return from the merge task instead of calling sys.exit directly. (trunk ↵Zac Medico2007-03-241-6/+1
| | | | | | r6274:6275) svn path=/main/branches/2.1.2/; revision=6276
* Allow the merge task to continue despite conflicts when --fetch-all-uri is ↵Zac Medico2007-03-241-0/+1
| | | | | | specified. (trunk r6272:6273) svn path=/main/branches/2.1.2/; revision=6274
* For bug #169620, in --tree display always show the dowload size on the node ↵v2.1.2.2Zac Medico2007-03-061-3/+2
| | | | | | that is "ordered" rather than one of it's "nomerge" counterparts. (trunk r6185:6186) svn path=/main/branches/2.1.2/; revision=6187
* Avoid pointless population of the binary tree when --buildpkg is enabled. ↵Zac Medico2007-03-051-3/+3
| | | | | | Thanks to vapier for reporting. (trunk r6174:6175) svn path=/main/branches/2.1.2/; revision=6176
* Display blockers at the end of the list so that it will more often be easy ↵Zac Medico2007-03-041-4/+8
| | | | | | for the user to see them in a terminal. Thanks to iapitus and hydrogen for the suggestion. (trunk r6168:6169) svn path=/main/branches/2.1.2/; revision=6170
* Fix the minimum index for pruning consecutive duplicate nodes. (trunk ↵Zac Medico2007-03-041-1/+1
| | | | | | r6163:6164) svn path=/main/branches/2.1.2/; revision=6165
* Add a note about --with-bdeps in the --depclean failure message. (trunk ↵Zac Medico2007-03-041-3/+4
| | | | | | r6161:6162) svn path=/main/branches/2.1.2/; revision=6163
* For bug #169187, make --depclean prune unneeded slots such that it is ↵Zac Medico2007-03-041-2/+8
| | | | | | consistent with the world update algorithm. (trunk r6159:6160) svn path=/main/branches/2.1.2/; revision=6161
* Only prune duplicate consecutive nodes if they both have depth == 0. (trunk ↵Zac Medico2007-03-031-1/+2
| | | | | | r6157:6158) svn path=/main/branches/2.1.2/; revision=6159
* Make sure that excess "nomerge" nodes are pruned correctly. (trunk r6147:6148)Zac Medico2007-03-031-1/+1
| | | | svn path=/main/branches/2.1.2/; revision=6149
* s/node/selected_parent/ for clarity (trunk r6140:6141)Zac Medico2007-03-031-2/+2
| | | | svn path=/main/branches/2.1.2/; revision=6142
* For bug #169046, fill in the --tree display with "nomerge" nodes so that the ↵Zac Medico2007-03-031-27/+75
| | | | | | user can always see at lease 1 parent on any non-root node. Packages may appear in the display list multiple times, and will be marked "nomerge" when their position in the list does not correspond to actual merge order. (trunk r6134:6135) svn path=/main/branches/2.1.2/; revision=6136
* When emerge automatically resumes, add --ignore-default-opts to the command ↵Zac Medico2007-03-021-2/+14
| | | | | | line in order to prevent things like --ask from leaking in via EMERGE_DEFAULT_OPTS. Thanks to Peter Weller <welp@gentoo.org> for reporting. (trunk r6132:6133) svn path=/main/branches/2.1.2/; revision=6134
* For bug #168646, remove --prune-empty-dirs from PORTAGE_RSYNC_OPTS since ↵Zac Medico2007-03-021-2/+1
| | | | | | it's only a small optimization and it's inconvenient to force >=rsync-2.6.4 on server admins at this time. If users desire, they can still add it to PORTAGE_RSYNC_EXTRA_OPTS. (trunk r6128:6129) svn path=/main/branches/2.1.2/; revision=6130
* Even if there's no timestamp available locally, fetch the timestamp anyway ↵Zac Medico2007-03-021-1/+6
| | | | | | as an initial probe to verify that the server is responsive. This protects us from hanging indefinitely on a connection attempt to an unresponsive server which rsync's --timeout option does not prevent. (trunk r6126:6127) svn path=/main/branches/2.1.2/; revision=6128
* Remove unnecessary print statement reported by solar. (trunk r6124:6125)Zac Medico2007-03-021-1/+0
| | | | svn path=/main/branches/2.1.2/; revision=6126
* Fix broken rsync exitcode shift. (trunk r6122:6123)Zac Medico2007-03-011-1/+1
| | | | svn path=/main/branches/2.1.2/; revision=6124
* Fix the rest of the broken except statement syntax. (trunk r6120:6121)Zac Medico2007-03-011-2/+2
| | | | svn path=/main/branches/2.1.2/; revision=6122
* Fix broken except statement syntax. (trunk r6118:6119)Zac Medico2007-03-011-1/+1
| | | | svn path=/main/branches/2.1.2/; revision=6120
* For consistency, remove exit code 2 (protocol incompatibility) from the ↵Zac Medico2007-03-011-1/+1
| | | | | | other list of rsync exit codes. (trunk r6116:6117) svn path=/main/branches/2.1.2/; revision=6118
* Merge --quiet fixes from trunk r6112:6113Zac Medico2007-03-011-4/+4
| | | | svn path=/main/branches/2.1.2/; revision=6114
* Make sure pids are appropriately removed from portage_exec.spawned_pids. ↵Zac Medico2007-03-011-2/+2
| | | | | | (trunk r6110:6111) svn path=/main/branches/2.1.2/; revision=6112
* Use an alarm signal to implement a timeout when rsync is fetching the server ↵Zac Medico2007-03-011-12/+40
| | | | | | timestamp file, since rsync's --timeout option doesn't apply to the initial connection attempt. (trunk r6108:6109) svn path=/main/branches/2.1.2/; revision=6110
* For bug #168646, don't bail out immediately when rsync detects protocol ↵Zac Medico2007-03-011-1/+7
| | | | | | incompatibility (code 2) during fetching of the timestamp file. Retry for a better server (up to PORTAGE_RSYNC_RETRIES). (trunk r6103:6104) svn path=/main/branches/2.1.2/; revision=6105
* For bug #167668, prune empty ${FILESDIR}s by adding --prune-empty-dirs to ↵Zac Medico2007-02-261-1/+2
| | | | | | PORTAGE_RSYNC_OPTS. Thanks to Ulrich Mueller <ulm@kph.uni-mainz.de> for the suggestion. (trunk r6069:6070) svn path=/main/branches/2.1.2/; revision=6071
* Allow --verbose to trigger a merge list even without --pretend, --ask, or ↵Zac Medico2007-02-241-2/+4
| | | | | | --tree. Thanks to agaffney and zlin for the suggestion. (trunk r6065:6066) svn path=/main/branches/2.1.2/; revision=6067
* As requested by solar, never show a merge list unless it's explicitly ↵Zac Medico2007-02-231-1/+2
| | | | | | requested by --ask, --pretend, or --tree. (trunk r6064) svn path=/main/branches/2.1.2/; revision=6065
* As requested by solar, never show a merge list unless it's explicitly ↵Zac Medico2007-02-231-0/+1
| | | | | | requested by --ask, --pretend, or --tree. svn path=/main/branches/2.1.2/; revision=6063
* Do not show the spinner and the "Calculating dependencies" message for ↵Zac Medico2007-02-231-7/+8
| | | | | | installation actions when the --nodeps option has been specified. Thanks to David Watzke <david@watzke.cz> for this patch from bug #168169. (trunk r6057:6058) svn path=/main/branches/2.1.2/; revision=6059
* spawn rsync without a shell. (trunk r6050:6051)Zac Medico2007-02-231-1/+3
| | | | svn path=/main/branches/2.1.2/; revision=6052
* Remove quotes since rsync doesn't accept them (and there is no shell to ↵Zac Medico2007-02-221-3/+3
| | | | | | remove them since we use spawn() for rsync now). (trunk r6047:6048) svn path=/main/branches/2.1.2/; revision=6050
* For bug #167668, use an rsync "hide" filter rule to exclude ↵Zac Medico2007-02-221-0/+1
| | | | | | **/files/digest-* and delete them on the receiver. (trunk r6046:6047) svn path=/main/branches/2.1.2/; revision=6049
* As requested by vapier, don't show the merge list in --quiet mode unless ↵Zac Medico2007-02-201-1/+2
| | | | | | it's explicitly requested via --ask or --pretend. (trunk r6016:6017) svn path=/main/branches/2.1.2/; revision=6018