Run of fresh-snapshots for cairo-dock

Merge these changes:

git pull https://janitor.debian.net/git/cairo-dock fresh-snapshots/main
git pull https://janitor.debian.net/git/cairo-dock fresh-snapshots/pristine-tar
git pull https://janitor.debian.net/git/cairo-dock fresh-snapshots/upstream

Summary

Merged new upstream version: 3.4.1+git20201103.0836f5d1+git20210327.3.6c569e6 (was: 3.4.1+git20201103.0836f5d1+git20210327.2.6c569e6).

Diff

Branch: main

Diff is too long (more than 200 lines). Download the raw diff.

Branch: pristine-tar

diff --git a/cairo-dock_3.4.1+git20201103.0836f5d1+git20210327.3.6c569e6.orig.tar.gz.delta b/cairo-dock_3.4.1+git20201103.0836f5d1+git20210327.3.6c569e6.orig.tar.gz.delta
new file mode 100644
index 0000000..79eacfc
Binary files /dev/null and b/cairo-dock_3.4.1+git20201103.0836f5d1+git20210327.3.6c569e6.orig.tar.gz.delta differ
diff --git a/cairo-dock_3.4.1+git20201103.0836f5d1+git20210327.3.6c569e6.orig.tar.gz.id b/cairo-dock_3.4.1+git20201103.0836f5d1+git20210327.3.6c569e6.orig.tar.gz.id
new file mode 100644
index 0000000..2067421
--- /dev/null
+++ b/cairo-dock_3.4.1+git20201103.0836f5d1+git20210327.3.6c569e6.orig.tar.gz.id
@@ -0,0 +1 @@
+f7e1a3b2205fa59a52e1fe60bfe6a464b3dcb2ac

Branch: upstream

Tag: upstream/3.4.1+git20201103.0836f5d1+git20210327.3.6c569e6
diff --git a/src/gldit/cairo-dock-file-manager.c b/src/gldit/cairo-dock-file-manager.c
index fb6bbb5..3f12deb 100644
--- a/src/gldit/cairo-dock-file-manager.c
+++ b/src/gldit/cairo-dock-file-manager.c
@@ -491,7 +491,18 @@ gboolean cairo_dock_copy_file (const gchar *cFilePath, const gchar *cDestPath)
 	gboolean ret = TRUE;
 	// open both files
 	int src_fd = open (cFilePath, O_RDONLY);
-	int dest_fd = open (cDestPath, O_CREAT | O_WRONLY, S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH);  // mode=644
+	int dest_fd;
+	if (g_file_test (cDestPath, G_FILE_TEST_IS_DIR))
+	{
+		const gchar *cFileName = strrchr(cFilePath, '/');
+		gchar *cFileDest = g_strdup_printf("%s/%s", cDestPath, cFileName ? cFileName : cFilePath);
+		dest_fd = open (cFileDest, O_CREAT | O_WRONLY, S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH);  // mode=644
+		g_free(cFileDest);
+	}
+	else
+	{
+		dest_fd = open (cDestPath, O_CREAT | O_WRONLY, S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH);  // mode=644
+	}
 	struct stat stat;
 	// get data size to be copied
 	if (fstat (src_fd, &stat) < 0)

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far. not currently attempting to back off
  • ☒ merge proposals for the package maintainer are currently being rate-limited (open: 1135, max open: 200)
  • ☑ change set c06f48e1-d04c-4de0-9cf0-63bff533f1a4 is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots cairo-dock-core-dbgsymapt install -t fresh-snapshots cairo-dock-coreapt install -t fresh-snapshots cairo-dock-devapt install -t fresh-snapshots cairo-dock

Lintian Result

Full worker log Full build log