summaryrefslogtreecommitdiff
path: root/debian/patches/80_dest_exists_abs_path.patch
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2015-12-13 18:21:11 +0100
committerMattia Rizzolo <mattia@debian.org>2015-12-13 18:21:11 +0100
commit2d7ce7ef2319d3acdbd4ebe1a3660307bd2ddf5e (patch)
tree0454584d1b41118758b2d2a2d40d1db4d94bcfd4 /debian/patches/80_dest_exists_abs_path.patch
parent97d87e1fa0808cf747bf0a4fe3b39d1cbdb5efc8 (diff)
jack (3.1.1+cvs20050801-29.1) unstable; urgency=medium
* Non-maintainer upload. * Build with dh-python instead of python-support. Closes: #786042 * Update watch file. [dgit import package jack 3.1.1+cvs20050801-29.1]
Diffstat (limited to 'debian/patches/80_dest_exists_abs_path.patch')
-rw-r--r--debian/patches/80_dest_exists_abs_path.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/debian/patches/80_dest_exists_abs_path.patch b/debian/patches/80_dest_exists_abs_path.patch
new file mode 100644
index 0000000..4aef413
--- /dev/null
+++ b/debian/patches/80_dest_exists_abs_path.patch
@@ -0,0 +1,16 @@
+When a "destination exists already" error is displayed, show the absolute
+path rather than the one corresponding to the album name. Debian #293332.
+
+
+diff -urN jack-3.1.1~/jack_utils.py jack-3.1.1/jack_utils.py
+--- jack-3.1.1~/jack_utils.py 2005-07-28 23:18:40.722448528 +0100
++++ jack-3.1.1/jack_utils.py 2005-07-28 23:37:18.256557520 +0100
+@@ -94,7 +94,7 @@
+
+ last_of_new = new[-1]
+ if os.path.exists(last_of_new):
+- error("destination directory already exists: " + last_of_new)
++ error("destination directory already exists: " + os.path.join(*[cf['_base_dir']] + new))
+ try:
+ os.rename(cwd, last_of_new)
+ except OSError: