From: Ansgar Burchardt <ansgar@debian.org>
Date: Tue, 31 Jul 2012 17:11:58 +0000 (+0200)
Subject: daklib/utils.py (poolify): no longer include component
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d48e4be67b4efe86133bdff6a310eb3e071c9f51;p=dak.git

daklib/utils.py (poolify): no longer include component

The component is no longer part of the filename we store. This is needed
to allow having the same file in multiple components at the same time.
---

diff --git a/daklib/utils.py b/daklib/utils.py
index 4ee00a1c..25549f04 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -701,13 +701,11 @@ def send_mail (message, filename=""):
 
 ################################################################################
 
-def poolify (source, component):
-    if component:
-        component += '/'
+def poolify (source, component=None):
     if source[:3] == "lib":
-        return component + source[:4] + '/' + source + '/'
+        return source[:4] + '/' + source + '/'
     else:
-        return component + source[:1] + '/' + source + '/'
+        return source[:1] + '/' + source + '/'
 
 ################################################################################