vhaudiquet/pkh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deb: fix package directory detection by looking for 'debian' subfolder
All checks were successful
CI / build (push) Successful in 16m35s
Details
CI / snap (push) Successful in 3m35s
Details

Browse Source
This commit is contained in:
Valentin Haudiquet
2026-01-28 15:59:31 +01:00
parent b2d89ead7e
commit af73c14674
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/deb/mod.rs
View File

@@ -102,7 +102,7 @@ pub(crate) fn find_package_directory(
// Try package/package pattern first // Try package/package pattern first
let package_dir = parent_dir.join(package).join(package); let package_dir = parent_dir.join(package).join(package);
if ctx.exists(&package_dir)? { if ctx.exists(&package_dir)? && ctx.exists(&package_dir.join("debian"))? {
return Ok(package_dir); return Ok(package_dir);
} }
@@ -117,19 +117,19 @@ pub(crate) fn find_package_directory(
let package_dir = parent_dir let package_dir = parent_dir
.join(package) .join(package)
.join(format!("{}-{}", package, origversion)); .join(format!("{}-{}", package, origversion));
if ctx.exists(&package_dir)? { if ctx.exists(&package_dir)? && ctx.exists(&package_dir.join("debian"))? {
return Ok(package_dir); return Ok(package_dir);
} }
// Try 'package' only // Try 'package' only
let package_dir = parent_dir.join(package); let package_dir = parent_dir.join(package);
if ctx.exists(&package_dir)? { if ctx.exists(&package_dir)? && ctx.exists(&package_dir.join("debian"))? {
return Ok(package_dir); return Ok(package_dir);
} }
// Try package-origversion only // Try package-origversion only
let package_dir = parent_dir.join(format!("{}-{}", package, origversion)); let package_dir = parent_dir.join(format!("{}-{}", package, origversion));
if ctx.exists(&package_dir)? { if ctx.exists(&package_dir)? && ctx.exists(&package_dir.join("debian"))? {
return Ok(package_dir); return Ok(package_dir);
} }