fixed issue when a package with the same name was in both repos and aur

i18n
jan Michal 2 years ago
parent c5c65e2dee
commit 511d70299e
No known key found for this signature in database
GPG Key ID: CB521D73AA05EBF2

@ -1,6 +1,6 @@
[package] [package]
name = "Amethyst" name = "Amethyst"
version = "3.0.0" version = "3.0.1"
authors = ["michal <michal@tar.black>", "axtlos <axtlos@tar.black>"] authors = ["michal <michal@tar.black>", "axtlos <axtlos@tar.black>"]
edition = "2021" edition = "2021"
description = "A fast and efficient AUR helper." description = "A fast and efficient AUR helper."
@ -57,4 +57,4 @@ runas = "0.2.1"
rusqlite = { version = "0.26.3", default-features = false } rusqlite = { version = "0.26.3", default-features = false }
ureq = { version = "2.4.0", default-features = false, features = ["native-tls", "json"] } ureq = { version = "2.4.0", default-features = false, features = ["native-tls", "json"] }
serde = { version = "1.0.90", default-features = false, features = ["derive", "serde_derive"] } serde = { version = "1.0.90", default-features = false, features = ["derive", "serde_derive"] }
native-tls = "0.2.8" native-tls = "0.2.8"

@ -3,7 +3,7 @@
# Developer: jnats <jnats[at]salyut[dot]one> # Developer: jnats <jnats[at]salyut[dot]one>
pkgname=amethyst pkgname=amethyst
pkgver=3.0.0 pkgver=3.0.1
pkgrel=1 pkgrel=1
pkgdesc="Fast, efficient and lightweight AUR helper/pacman wrapper" pkgdesc="Fast, efficient and lightweight AUR helper/pacman wrapper"
arch=('any') arch=('any')

@ -24,16 +24,16 @@ pub fn sort(input: &[String], options: Options) -> structs::Sorted {
.status() .status()
.expect("Something has gone wrong"); .expect("Something has gone wrong");
if rpc::rpcinfo(b.to_string()).found { if let Some(0) = rs.code() {
if verbosity >= 1 {
log(format!("{} found in AUR", b));
}
aur.push(b.to_string());
} else if let Some(0) = rs.code() {
if verbosity >= 1 { if verbosity >= 1 {
log(format!("{} found in repos", b)); log(format!("{} found in repos", b));
} }
repo.push(b.to_string()); repo.push(b.to_string());
} else if rpc::rpcinfo(b.to_string()).found {
if verbosity >= 1 {
log(format!("{} found in AUR", b));
}
aur.push(b.to_string());
} else { } else {
if verbosity >= 1 { if verbosity >= 1 {
log(format!("{} not found", b)); log(format!("{} not found", b));

Loading…
Cancel
Save