mirror of
https://github.com/kiviktnm/decman.git
synced 2026-09-19 12:08:28 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fc668600ba | ||
|
|
d4dc676878 | ||
|
|
cc33ce97ae | ||
|
|
bb6d65428a | ||
|
|
a94b0e2db8 |
+1
-1
@@ -183,7 +183,7 @@ from decman import Directory
|
||||
import decman
|
||||
|
||||
# To declare a directory, add it's target path and create a Directory object
|
||||
decman.directories["/home/me/.config/nvim"] = File(
|
||||
decman.directories["/home/me/.config/nvim"] = Directory(
|
||||
source_directory="./dotfiles/nvim",
|
||||
bin_files=False,
|
||||
encoding="utf-8",
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[project]
|
||||
name = "decman-flatpak"
|
||||
version = "1.1.0"
|
||||
version = "1.2.2"
|
||||
requires-python = ">=3.13"
|
||||
dependencies = ["decman==1.2.1"]
|
||||
dependencies = ["decman==1.2.2"]
|
||||
|
||||
[project.entry-points."decman.plugins"]
|
||||
flatpak = "decman.plugins.flatpak:Flatpak"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
[project]
|
||||
name = "decman-pacman"
|
||||
version = "1.1.0"
|
||||
version = "1.2.2"
|
||||
requires-python = ">=3.13"
|
||||
dependencies = [
|
||||
"decman==1.2.1",
|
||||
"decman==1.2.2",
|
||||
"pyalpm",
|
||||
"requests",
|
||||
]
|
||||
|
||||
@@ -454,6 +454,12 @@ class ForeignPackageManager:
|
||||
raise ForeignPackageManagerError("Failed to compare versions using vercmp.") from error
|
||||
|
||||
|
||||
def _last_non_empty_line(text: str) -> str:
|
||||
return next(
|
||||
(line.strip() for line in reversed(text.splitlines()) if line.strip()), ""
|
||||
)
|
||||
|
||||
|
||||
class PackageBuilder:
|
||||
"""
|
||||
Used for building packages in a chroot.
|
||||
@@ -642,7 +648,7 @@ class PackageBuilder:
|
||||
if p not in self._pkgs_in_chroot:
|
||||
cmd = self._commands.resolve_real_name_chroot(self.chroot_dir, p)
|
||||
_, cmd_output = command.check_run_result(cmd, command.run(cmd))
|
||||
real_pkgname = cmd_output.strip()
|
||||
real_pkgname = _last_non_empty_line(cmd_output)
|
||||
to_remove.add(real_pkgname)
|
||||
|
||||
if to_remove:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
[project]
|
||||
name = "decman-systemd"
|
||||
version = "1.1.0"
|
||||
version = "1.2.2"
|
||||
requires-python = ">=3.13"
|
||||
dependencies = ["decman==1.2.1"]
|
||||
dependencies = ["decman==1.2.2"]
|
||||
|
||||
[project.entry-points."decman.plugins"]
|
||||
systemd = "decman.plugins.systemd:Systemd"
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "decman"
|
||||
version = "1.2.1"
|
||||
version = "1.2.2"
|
||||
description = "Declarative package & configuration manager for Arch Linux."
|
||||
license = "GPL-3.0-or-later"
|
||||
license-files = ["LICENSE"]
|
||||
|
||||
@@ -71,7 +71,7 @@ wheels = [
|
||||
|
||||
[[package]]
|
||||
name = "decman"
|
||||
version = "1.2.1"
|
||||
version = "1.2.2"
|
||||
source = { editable = "." }
|
||||
|
||||
[package.optional-dependencies]
|
||||
@@ -107,7 +107,7 @@ dev = [
|
||||
|
||||
[[package]]
|
||||
name = "decman-flatpak"
|
||||
version = "1.1.0"
|
||||
version = "1.2.2"
|
||||
source = { editable = "plugins/decman-flatpak" }
|
||||
dependencies = [
|
||||
{ name = "decman" },
|
||||
@@ -118,7 +118,7 @@ requires-dist = [{ name = "decman", editable = "." }]
|
||||
|
||||
[[package]]
|
||||
name = "decman-pacman"
|
||||
version = "1.1.0"
|
||||
version = "1.2.2"
|
||||
source = { editable = "plugins/decman-pacman" }
|
||||
dependencies = [
|
||||
{ name = "decman" },
|
||||
@@ -147,7 +147,7 @@ dev = [
|
||||
|
||||
[[package]]
|
||||
name = "decman-systemd"
|
||||
version = "1.1.0"
|
||||
version = "1.2.2"
|
||||
source = { editable = "plugins/decman-systemd" }
|
||||
dependencies = [
|
||||
{ name = "decman" },
|
||||
|
||||
Reference in New Issue
Block a user