[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] Drop redundant argument for poolify



Signed-off-by: Niels Thykier <niels@thykier.net>
---
 dak/check_archive.py | 2 +-
 daklib/changes.py    | 4 ++--
 daklib/utils.py      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dak/check_archive.py b/dak/check_archive.py
index 926b4fb..a3b771a 100755
--- a/dak/check_archive.py
+++ b/dak/check_archive.py
@@ -402,7 +402,7 @@ def validate_sources(suite, component):
                 if directory.find("potato") == -1:
                     print "W: %s missing." % (filename)
                 else:
-                    pool_location = utils.poolify (source, component)
+                    pool_location = utils.poolify(source)
                     pool_filename = "%s/%s/%s" % (Cnf["Dir::Pool"], pool_location, name)
                     if not os.path.exists(pool_filename):
                         print "E: %s missing (%s)." % (filename, pool_filename)
diff --git a/daklib/changes.py b/daklib/changes.py
index d6ccaa0..1bdc7cf 100644
--- a/daklib/changes.py
+++ b/daklib/changes.py
@@ -130,7 +130,7 @@ class Changes(object):
                     deb_fh.close()
 
             else:
-                entry["pool name"] = poolify(self.changes.get("source", ""), entry["component"])
+                entry["pool name"] = poolify(self.changes.get("source", ""))
                 destination = entry["pool name"] + name
                 summary += name + "\n  to " + destination + "\n"
 
@@ -194,7 +194,7 @@ class Changes(object):
         else:
             component = entry["component"]
 
-        poolname = poolify(entry["source"], component)
+        poolname = poolify(entry["source"])
         l = get_location(cnf["Dir::Pool"], component, session=session)
 
         found, poolfile = check_poolfile(os.path.join(poolname, filename),
diff --git a/daklib/utils.py b/daklib/utils.py
index 5e84c35..e0f00ce 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -504,7 +504,7 @@ def send_mail (message, filename="", whitelists=None):
 
 ################################################################################
 
-def poolify (source, component=None):
+def poolify (source):
     if source[:3] == "lib":
         return source[:4] + '/' + source + '/'
     else:
-- 
2.1.4



Reply to: