--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: debdry: wrong management of subdir combination
- From: Marco Bardelli <bardelli.marco@gmail.com>
- Date: Thu, 30 Apr 2015 16:32:37 +0200
- Message-id: <20150430143237.32444.48661.reportbug@localhost>
Package: debdry
Version: 0.2.1-1
Severity: normal
Tags: patch
Dear Maintainer,
Putting only debian/source/options, debdry die trying to copy
debian.auto/source/format into debian.auto/source/format and shutil
raise shutil.SameFileError.
A workaround could be put all needed stuff in subdir source, avoiding
to getting Directtory.combine, I guess.
I think the combination of subdirs, like source, should allow to maintain
only partial stuff.
I think the attached path can solve.
-- System Information:
Debian Release: 8.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf, armel
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages debdry depends on:
ii python3 3.4.2-2
ii python3-apt 0.9.3.11
pn python3:any <none>
debdry recommends no packages.
debdry suggests no packages.
-- no debconf information
commit 3aa751e1a0badd80c0466b8c9182d85e928ba6b1
Author: Marco Bardelli <bardelli.marco@gmail.com>
Date: Sat Dec 13 05:01:16 2014 +0100
fix typos
diff --git a/debdrylib/tree.py b/debdrylib/tree.py
index daa82f3..0963b77 100644
--- a/debdrylib/tree.py
+++ b/debdrylib/tree.py
@@ -126,11 +126,11 @@ class Directory(DirectoryBase):
os.makedirs(absname, exist_ok=True)
res = self.__class__(relname, absname)
for k in self.files.keys() - other.files.keys():
- self.files[k] = self.files[k].copy_to(k, os.path.join(self.absname, k))
+ self.files[k] = self.files[k].copy_to(k, os.path.join(absname, k))
for k in other.files.keys() - self.files.keys():
- self.files[k] = other.files[k].copy_to(k, os.path.join(self.absname, k))
+ self.files[k] = other.files[k].copy_to(k, os.path.join(absname, k))
for k in other.files.keys() & self.files.keys():
- self.files[k] = self.files[k].combine(k, os.path.join(self.absname, k), other.files[k])
+ self.files[k] = self.files[k].combine(k, os.path.join(absname, k), other.files[k])
return self
def diff(self, relname, absname, other):
@@ -138,7 +138,7 @@ class Directory(DirectoryBase):
res = self.__class__(relname, absname)
for k in self.files.keys() - other.files.keys():
log.warn("{}: exists in {} but not in {}: ignoring file".format(
- self.relname, base.absname, extra.absname))
+ k, self.absname, other.absname))
for k in other.files.keys() - self.files.keys():
self.files[k] = other.files[k].copy_to(k, os.path.join(self.absname, k))
for k in other.files.keys() & self.files.keys():
--- End Message ---