mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-05 09:14:03 +00:00
Improve style a little and remove one always-true condition.
Approved by: portmgr (pav) Approved by: kib (mentor)
This commit is contained in:
parent
a03ee0000e
commit
4f49091fda
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=177741
@ -252,7 +252,7 @@ pkg_do(char *pkg)
|
||||
}
|
||||
|
||||
/* Now check the packing list for conflicts */
|
||||
if(!IgnoreDeps){
|
||||
if (!IgnoreDeps){
|
||||
for (p = Plist.head; p != NULL; p = p->next) {
|
||||
if (p->type == PLIST_CONFLICTS) {
|
||||
int i;
|
||||
@ -297,7 +297,7 @@ pkg_do(char *pkg)
|
||||
!(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)) {
|
||||
char path[FILENAME_MAX], *cp = NULL;
|
||||
|
||||
if (!Fake&&!IgnoreDeps) {
|
||||
if (!Fake) {
|
||||
char prefixArg[2 + MAXPATHLEN]; /* "-P" + Prefix */
|
||||
if (PrefixRecursive) {
|
||||
strlcpy(prefixArg, "-P", sizeof(prefixArg));
|
||||
@ -369,7 +369,7 @@ pkg_do(char *pkg)
|
||||
else if (Verbose)
|
||||
printf(" - already installed.\n");
|
||||
}
|
||||
}
|
||||
} /* if (!IgnoreDeps) */
|
||||
|
||||
if (code != 0)
|
||||
goto bomb;
|
||||
|
Loading…
Reference in New Issue
Block a user