[pbs-devel] [PATCH proxmox-backup 1/2] d/control: add jq as a build dependency

[pbs-devel] [PATCH proxmox-backup 1/2] d/control: add jq as a build dependency

[Fiona Ebner]

It's used in the Makefile and building will fail without it.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index f96f5438..aed9b876 100644
--- a/debian/control
+++ b/debian/control
@@ -131,6 +131,7 @@ Build-Depends: debhelper (>= 12),
  fonts-lato <!nodoc>,
  fonts-open-sans <!nodoc>,
  graphviz <!nodoc>,
+ jq,
  latexmk <!nodoc>,
  patchelf,
  proxmox-widget-toolkit-dev <!nodoc>,
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 2/2] d/postinst: check if datastore lockfile actually exists

[Fiona Ebner]

On an installation that never had any datastores, dkpg would fail to
configure the package.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 debian/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/postinst b/debian/postinst
index 489cf6ac..0485ca34 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -48,7 +48,7 @@ case "$1" in
 			true
 		fi
 
-		if dpkg --compare-versions "$2" 'lt' '2.3.1~'; then
+		if dpkg --compare-versions "$2" 'lt' '2.3.1~' && test -e /etc/proxmox-backup/.datastore.lck; then
 			lock_user="$(stat --format '%U' /etc/proxmox-backup/.datastore.lck)"
 			if [ "${lock_user}" != "backup" ]; then
 				echo "updating /etc/proxmox-backup/.datastore.lck from wrong user '${lock_user}' to 'backup'"
-- 
2.30.2

[pbs-devel] applied-series: [PATCH proxmox-backup 1/2] d/control: add jq as a build dependency

[Wolfgang Bumiller]

applied series, thanks

On Thu, Dec 15, 2022 at 09:13:24AM +0100, Fiona Ebner wrote:
> It's used in the Makefile and building will fail without it.
> 
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
>  debian/control | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/debian/control b/debian/control
> index f96f5438..aed9b876 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -131,6 +131,7 @@ Build-Depends: debhelper (>= 12),
>   fonts-lato <!nodoc>,
>   fonts-open-sans <!nodoc>,
>   graphviz <!nodoc>,
> + jq,
>   latexmk <!nodoc>,
>   patchelf,
>   proxmox-widget-toolkit-dev <!nodoc>,
> -- 
> 2.30.2