uqbar-dao/nectar
1
1
Fork 0
mirror of https://github.com/uqbar-dao/nectar.git synced 2024-11-23 21:04:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict errors

Browse Source
This commit is contained in:
Drew Tada 2024-02-15 11:58:31 -05:00
parent 6af15a0f26
commit 615cd91a05
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kinode/packages/app_store/app_store/src/http_api.rs
View File

@ -189,7 +189,7 @@ fn serve_paths(
}
Method::PUT => {
// update an app
let pkg_listing: &PackageListing = state
let _pkg_listing: &PackageListing = state
.get_listing(&package_id)
.ok_or(anyhow::anyhow!("No package"))?;
let pkg_state: &PackageState = state
@ -281,9 +281,7 @@ fn serve_paths(
.expect("Package does not have metadata")
.properties
.mirrors
.as_ref()
.ok_or(anyhow::anyhow!("No mirrors for package {package_id}"))?;
.as_ref();
// TODO select on FE
let download_from = body_json
.get("download_from")

2
kinode/packages/app_store/app_store/src/lib.rs
View File

@ -378,7 +378,7 @@ pub fn start_download(
}
fn handle_receive_download(
_our: &Address,
our: &Address,
state: &mut State,
package_name: &str,
requested_packages: &mut HashMap<PackageId, RequestedPackage>,