X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fsymlink_dists.py;h=6656ab6d9df692c61e96c22294d3d85ab6796c21;hb=06b17e68fd4a76e7a12f741f26654e55bff05c79;hp=95bf151eed59d510aec23d4b0928a618f24af1a7;hpb=e2ae71066cbb134753d7bfceb16e87d0b76dfd6e;p=dak.git

diff --git a/dak/symlink_dists.py b/dak/symlink_dists.py
old mode 100755
new mode 100644
index 95bf151e..6656ab6d
--- a/dak/symlink_dists.py
+++ b/dak/symlink_dists.py
@@ -59,7 +59,6 @@ def fix_component_section (component, section):
 
     # FIXME: ugly hacks to work around override brain damage
     section = re_strip_section_prefix.sub('', section)
-    section = section.lower().replace('non-us', '')
     if section == "main" or section == "contrib" or section == "non-free":
         section = ''
     if section != '':
@@ -100,8 +99,8 @@ SELECT DISTINCT ON (f.id) c.name, sec.section, l.path, f.filename, f.id
             section=""
         dest = "%sdists/%s/%s/source/%s%s" % (Cnf["Dir::Root"], codename, component, section, os.path.basename(i[3]))
         if not os.path.exists(dest):
-	    src = i[2]+i[3]
-	    src = daklib.utils.clean_symlink(src, dest, Cnf["Dir::Root"])
+            src = i[2]+i[3]
+            src = daklib.utils.clean_symlink(src, dest, Cnf["Dir::Root"])
             if Cnf.Find("Symlink-Dists::Options::Verbose"):
                 print src+' -> '+dest
             os.symlink(src, dest)
@@ -166,18 +165,18 @@ def main ():
     Arguments = [('h',"help","Symlink-Dists::Options::Help"),
                  ('v',"verbose","Symlink-Dists::Options::Verbose")]
     for i in ["help", "verbose" ]:
-	if not Cnf.has_key("Symlink-Dists::Options::%s" % (i)):
-	    Cnf["Symlink-Dists::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Symlink-Dists::Options::%s" % (i)):
+            Cnf["Symlink-Dists::Options::%s" % (i)] = ""
 
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
     Options = Cnf.SubTree("Symlink-Dists::Options")
 
     if Options["Help"]:
-	usage()
+        usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
 
-    database.init(Cnf, projectB)
+    daklib.database.init(Cnf, projectB)
 
     find_dislocated_stable(Cnf, projectB)
 
@@ -185,4 +184,3 @@ def main ():
 
 if __name__ == '__main__':
     main()
-