mirror of
https://github.com/kiviktnm/decman.git
synced 2026-09-19 20:18:28 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fc668600ba | ||
|
|
d4dc676878 | ||
|
|
cc33ce97ae | ||
|
|
bb6d65428a | ||
|
|
a94b0e2db8 | ||
|
|
8c54220dbc | ||
|
|
e8d292be13 | ||
|
|
6c054681ee |
+1
-1
@@ -183,7 +183,7 @@ from decman import Directory
|
|||||||
import decman
|
import decman
|
||||||
|
|
||||||
# To declare a directory, add it's target path and create a Directory object
|
# 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",
|
source_directory="./dotfiles/nvim",
|
||||||
bin_files=False,
|
bin_files=False,
|
||||||
encoding="utf-8",
|
encoding="utf-8",
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "decman-flatpak"
|
name = "decman-flatpak"
|
||||||
version = "1.1.0"
|
version = "1.2.2"
|
||||||
requires-python = ">=3.13"
|
requires-python = ">=3.13"
|
||||||
dependencies = ["decman==1.2.0"]
|
dependencies = ["decman==1.2.2"]
|
||||||
|
|
||||||
[project.entry-points."decman.plugins"]
|
[project.entry-points."decman.plugins"]
|
||||||
flatpak = "decman.plugins.flatpak:Flatpak"
|
flatpak = "decman.plugins.flatpak:Flatpak"
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "decman-pacman"
|
name = "decman-pacman"
|
||||||
version = "1.1.0"
|
version = "1.2.2"
|
||||||
requires-python = ">=3.13"
|
requires-python = ">=3.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"decman==1.2.0",
|
"decman==1.2.2",
|
||||||
"pyalpm",
|
"pyalpm",
|
||||||
"requests",
|
"requests",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -454,6 +454,12 @@ class ForeignPackageManager:
|
|||||||
raise ForeignPackageManagerError("Failed to compare versions using vercmp.") from error
|
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:
|
class PackageBuilder:
|
||||||
"""
|
"""
|
||||||
Used for building packages in a chroot.
|
Used for building packages in a chroot.
|
||||||
@@ -642,7 +648,7 @@ class PackageBuilder:
|
|||||||
if p not in self._pkgs_in_chroot:
|
if p not in self._pkgs_in_chroot:
|
||||||
cmd = self._commands.resolve_real_name_chroot(self.chroot_dir, p)
|
cmd = self._commands.resolve_real_name_chroot(self.chroot_dir, p)
|
||||||
_, cmd_output = command.check_run_result(cmd, command.run(cmd))
|
_, 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)
|
to_remove.add(real_pkgname)
|
||||||
|
|
||||||
if to_remove:
|
if to_remove:
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "decman-systemd"
|
name = "decman-systemd"
|
||||||
version = "1.1.0"
|
version = "1.2.2"
|
||||||
requires-python = ">=3.13"
|
requires-python = ">=3.13"
|
||||||
dependencies = ["decman==1.2.0"]
|
dependencies = ["decman==1.2.2"]
|
||||||
|
|
||||||
[project.entry-points."decman.plugins"]
|
[project.entry-points."decman.plugins"]
|
||||||
systemd = "decman.plugins.systemd:Systemd"
|
systemd = "decman.plugins.systemd:Systemd"
|
||||||
|
|||||||
@@ -248,7 +248,7 @@ class Systemd(plugins.Plugin):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
cmd = self.commands.user_daemon_reload(user)
|
cmd = self.commands.user_daemon_reload(user)
|
||||||
command.prg(cmd, pty=config.debug_output)
|
command.prg(cmd, pty=config.debug_output, check=False)
|
||||||
|
|
||||||
def reload_daemon(self):
|
def reload_daemon(self):
|
||||||
"""
|
"""
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "decman"
|
name = "decman"
|
||||||
version = "1.2.0"
|
version = "1.2.2"
|
||||||
description = "Declarative package & configuration manager for Arch Linux."
|
description = "Declarative package & configuration manager for Arch Linux."
|
||||||
license = "GPL-3.0-or-later"
|
license = "GPL-3.0-or-later"
|
||||||
license-files = ["LICENSE"]
|
license-files = ["LICENSE"]
|
||||||
|
|||||||
@@ -300,6 +300,9 @@ class Symlink:
|
|||||||
os.unlink(link_name)
|
os.unlink(link_name)
|
||||||
|
|
||||||
os.symlink(self.target, link_name)
|
os.symlink(self.target, link_name)
|
||||||
|
if self.uid is not None:
|
||||||
|
assert self.gid is not None, "If uid is set, then gid is set."
|
||||||
|
os.chown(link_name, self.uid, self.gid, follow_symlinks=False)
|
||||||
return True
|
return True
|
||||||
except OSError as error:
|
except OSError as error:
|
||||||
raise errors.FSSymlinkFailedError(
|
raise errors.FSSymlinkFailedError(
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "decman"
|
name = "decman"
|
||||||
version = "1.2.0"
|
version = "1.2.2"
|
||||||
source = { editable = "." }
|
source = { editable = "." }
|
||||||
|
|
||||||
[package.optional-dependencies]
|
[package.optional-dependencies]
|
||||||
@@ -107,7 +107,7 @@ dev = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "decman-flatpak"
|
name = "decman-flatpak"
|
||||||
version = "1.1.0"
|
version = "1.2.2"
|
||||||
source = { editable = "plugins/decman-flatpak" }
|
source = { editable = "plugins/decman-flatpak" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "decman" },
|
{ name = "decman" },
|
||||||
@@ -118,7 +118,7 @@ requires-dist = [{ name = "decman", editable = "." }]
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "decman-pacman"
|
name = "decman-pacman"
|
||||||
version = "1.1.0"
|
version = "1.2.2"
|
||||||
source = { editable = "plugins/decman-pacman" }
|
source = { editable = "plugins/decman-pacman" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "decman" },
|
{ name = "decman" },
|
||||||
@@ -147,7 +147,7 @@ dev = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "decman-systemd"
|
name = "decman-systemd"
|
||||||
version = "1.1.0"
|
version = "1.2.2"
|
||||||
source = { editable = "plugins/decman-systemd" }
|
source = { editable = "plugins/decman-systemd" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "decman" },
|
{ name = "decman" },
|
||||||
|
|||||||
Reference in New Issue
Block a user