Fix typos

This commit is contained in:
morganamilo 2018-06-04 20:12:26 +01:00
parent 6c22d5987c
commit bad0af1a8a
No known key found for this signature in database
GPG key ID: 6FE9E7996B0B082E
3 changed files with 16 additions and 16 deletions

View file

@ -92,7 +92,7 @@ func (dp *depPool) ResolveTargets(pkgs []string) error {
// skip targets already satisfied // skip targets already satisfied
// even if the user enters db/pkg and aur/pkg the latter will // even if the user enters db/pkg and aur/pkg the latter will
// still get skiped even if it's from a different database to // still get skipped even if it's from a different database to
// the one specified // the one specified
// this is how pacman behaves // this is how pacman behaves
if dp.hasPackage(target.DepString()) { if dp.hasPackage(target.DepString()) {
@ -109,7 +109,7 @@ func (dp *depPool) ResolveTargets(pkgs []string) error {
continue continue
} }
// if theres a different priefix only look in that repo // If there'ss a different priefix only look in that repo
if target.Db != "" { if target.Db != "" {
singleDb, err = alpmHandle.SyncDbByName(target.Db) singleDb, err = alpmHandle.SyncDbByName(target.Db)
if err != nil { if err != nil {
@ -128,11 +128,11 @@ func (dp *depPool) ResolveTargets(pkgs []string) error {
continue continue
} else { } else {
//check for groups //check for groups
//currently we dont resolve the packages in a group //currently we don't resolve the packages in a group
//only check if the group exists //only check if the group exists
//would be better to check the groups from singleDb if //would be better to check the groups from singleDb if
//the user specified a db but theres no easy way to do //the user specified a db but there's no easy way to do
//it without making alpm_lists so dont bother for now //it without making alpm_lists so don't bother for now
//db/group is probably a rare use case //db/group is probably a rare use case
group, err := dp.SyncDb.PkgCachebyGroup(target.Name) group, err := dp.SyncDb.PkgCachebyGroup(target.Name)
if err == nil { if err == nil {
@ -315,7 +315,7 @@ func (dp *depPool) resolveAURPackages(pkgs stringSet, explicit bool) error {
} }
//assume it's in the aur //assume it's in the aur
//ditch the versioning because the RPC cant handle it //ditch the versioning because the RPC can't handle it
newAURPackages.set(dep) newAURPackages.set(dep)
} }
@ -376,8 +376,8 @@ func (dp *depPool) findSatisfierAur(dep string) *rpc.Pkg {
// This is mostly used to promote packages from the cache // This is mostly used to promote packages from the cache
// to the Install list // to the Install list
// Provide a pacman style provider menu if theres more than one candidate // Provide a pacman style provider menu if there's more than one candidate
// This acts slightly differenly from Pacman, It will give // This acts slightly differently from Pacman, It will give
// a menu even if a package with a matching name exists. I believe this // a menu even if a package with a matching name exists. I believe this
// method is better because most of the time you are choosing between // method is better because most of the time you are choosing between
// foo and foo-git. // foo and foo-git.

View file

@ -63,12 +63,12 @@ Yay will also remove cached data about devel packages\&.
.PP .PP
\fB \-\-repo\fR \fB \-\-repo\fR
.RS 4 .RS 4
Assume all targets are from the repositories\&. Aditionally Actions such as Assume all targets are from the repositories\&. Additionally Actions such as
sysupgrade will only act on repository packages\&. sysupgrade will only act on repository packages\&.
.RE .RE
\fB\-a \-\-aur\fR \fB\-a \-\-aur\fR
.RS 4 .RS 4
Assume all targets are from the AUR\&. Aditionally Actions such as Assume all targets are from the AUR\&. Additionally Actions such as
sysupgrade will only act on AUR packages\&. sysupgrade will only act on AUR packages\&.
Note that dependency resolving will still act as normal and include repository Note that dependency resolving will still act as normal and include repository
@ -139,7 +139,7 @@ a database refresh\&. Run \fByay \-Sy\fR Before this for an up to date result\&.
.RS 4 .RS 4
Print new news from the Archlinux homepage\&. News is considered new if it is Print new news from the Archlinux homepage\&. News is considered new if it is
newer than the build date of all native packages\&. Pass this twice to show all newer than the build date of all native packages\&. Pass this twice to show all
avaliable news\&. available news\&.
.RE .RE
.PP .PP
\fB\-q \-\-quiet\fR \fB\-q \-\-quiet\fR
@ -350,13 +350,13 @@ newer than the AUR's version use that instead of downloading a new one\&.
.RS 4 .RS 4
Look for matching providers when searching for AUR packages\&. When multiple Look for matching providers when searching for AUR packages\&. When multiple
providers are found a menu will appear prompting you to pick one\&. This providers are found a menu will appear prompting you to pick one\&. This
increases dependency resolve time although this should not be noticable\&. increases dependency resolve time although this should not be noticeable\&.
.RE .RE
.PP .PP
\fB\-\-noprovides\fR \fB\-\-noprovides\fR
.RS 4 .RS 4
Do not look for matching providers when searching for AUR packages\&. If Do not look for matching providers when searching for AUR packages\&. If
multiple providers happen to be found the menu will still apear\&. multiple providers happen to be found the menu will still appear\&.
.RE .RE
.PP .PP
\fB\-\-pgpfetch\fR \fB\-\-pgpfetch\fR

4
vcs.go
View file

@ -18,7 +18,7 @@ type vcsInfo map[string]shaInfos
type shaInfos map[string]shaInfo type shaInfos map[string]shaInfo
type shaInfo struct { type shaInfo struct {
Protocols []string `json:"protocols"` Protocols []string `json:"protocols"`
Brach string `json:"branch"` Branch string `json:"branch"`
SHA string `json:"sha"` SHA string `json:"sha"`
} }
@ -180,7 +180,7 @@ func (infos shaInfos) needsUpdate() bool {
hasUpdate := make(chan struct{}) hasUpdate := make(chan struct{})
checkHash := func(url string, info shaInfo) { checkHash := func(url string, info shaInfo) {
hash := getCommit(url, info.Brach, info.Protocols) hash := getCommit(url, info.Branch, info.Protocols)
if hash != "" && hash != info.SHA { if hash != "" && hash != info.SHA {
hasUpdate <- struct{}{} hasUpdate <- struct{}{}
} else { } else {