system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-07-05 18:01:50 +00:00
Code Issues Projects Releases Wiki Activity

remove suspicious err reassigns

Browse Source
This commit is contained in:
Motkov Kirill 2019-03-05 23:10:04 +03:00
parent a33801615c
commit 0878b485ae
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clean.go
View File

@ -68,7 +68,7 @@ func syncClean(parser *arguments) error {
}
if mode == modeRepo || mode == modeAny {
if err = show(passToPacman(parser)); err != nil {
if err := show(passToPacman(parser)); err != nil {
return err
}
}

35
config.go
View File

@ -352,7 +352,6 @@ func toUsage(usages []string) alpm.Usage {
}
func configureAlpm(conf *pacmanconf.Config) error {
var err error
// TODO: set SigLevel
//sigLevel := alpm.SigPackage | alpm.SigPackageOptional | alpm.SigDatabase | alpm.SigDatabaseOptional
@ -371,68 +370,64 @@ func configureAlpm(conf *pacmanconf.Config) error {
}
if err = alpmHandle.SetCacheDirs(pacmanConf.CacheDir); err != nil {
if err := alpmHandle.SetCacheDirs(pacmanConf.CacheDir); err != nil {
return err
}
// add hook directories 1-by-1 to avoid overwriting the system directory
for _, dir := range pacmanConf.HookDir {
if err = alpmHandle.AddHookDir(dir); err != nil {
if err := alpmHandle.AddHookDir(dir); err != nil {
return err
}
}
if err = alpmHandle.SetGPGDir(pacmanConf.GPGDir); err != nil {
if err := alpmHandle.SetGPGDir(pacmanConf.GPGDir); err != nil {
return err
}
if err = alpmHandle.SetLogFile(pacmanConf.LogFile); err != nil {
if err := alpmHandle.SetLogFile(pacmanConf.LogFile); err != nil {
return err
}
if err = alpmHandle.SetIgnorePkgs(pacmanConf.IgnorePkg); err != nil {
if err := alpmHandle.SetIgnorePkgs(pacmanConf.IgnorePkg); err != nil {
return err
}
if err = alpmHandle.SetIgnoreGroups(pacmanConf.IgnoreGroup); err != nil {
if err := alpmHandle.SetIgnoreGroups(pacmanConf.IgnoreGroup); err != nil {
return err
}
if err = alpmHandle.SetArch(pacmanConf.Architecture); err != nil {
if err := alpmHandle.SetArch(pacmanConf.Architecture); err != nil {
return err
}
if err = alpmHandle.SetNoUpgrades(pacmanConf.NoUpgrade); err != nil {
if err := alpmHandle.SetNoUpgrades(pacmanConf.NoUpgrade); err != nil {
return err
}
if err = alpmHandle.SetNoExtracts(pacmanConf.NoExtract); err != nil {
if err := alpmHandle.SetNoExtracts(pacmanConf.NoExtract); err != nil {
return err
}
/*if err = alpmHandle.SetDefaultSigLevel(sigLevel); err != nil {
/*if err := alpmHandle.SetDefaultSigLevel(sigLevel); err != nil {
return err
}
if err = alpmHandle.SetLocalFileSigLevel(localFileSigLevel); err != nil {
if err := alpmHandle.SetLocalFileSigLevel(localFileSigLevel); err != nil {
return err
}
if err = alpmHandle.SetRemoteFileSigLevel(remoteFileSigLevel); err != nil {
if err := alpmHandle.SetRemoteFileSigLevel(remoteFileSigLevel); err != nil {
return err
}*/
if err = alpmHandle.SetDeltaRatio(pacmanConf.UseDelta); err != nil {
if err := alpmHandle.SetDeltaRatio(pacmanConf.UseDelta); err != nil {
return err
}
if err = alpmHandle.SetUseSyslog(pacmanConf.UseSyslog); err != nil {
if err := alpmHandle.SetUseSyslog(pacmanConf.UseSyslog); err != nil {
return err
}
if err = alpmHandle.SetCheckSpace(pacmanConf.CheckSpace); err != nil {
return err
}
return nil
return alpmHandle.SetCheckSpace(pacmanConf.CheckSpace)
}

4
main.go
View File

@ -142,7 +142,7 @@ func initAlpm() error {
pacmanConf.GPGDir = value
}
if err = initAlpmHandle(); err != nil {
if err := initAlpmHandle(); err != nil {
return err
}
@ -173,7 +173,7 @@ func initAlpmHandle() error {
return fmt.Errorf("Unable to CreateHandle: %s", err)
}
if err = configureAlpm(pacmanConf); err != nil {
if err := configureAlpm(pacmanConf); err != nil {
return err
}