X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils.py;h=8058d3bea9b0305477a75ce08e465125c80a7e98;hb=62f80fe886360a984b5225c7aaa7637635335248;hp=1afcb77b0ae9caaabab1433785a15584bd028169;hpb=5cd51865d3ea349934a3b40a31b46e9d9a81dad4;p=dak.git diff --git a/utils.py b/utils.py index 1afcb77b..8058d3be 100644 --- a/utils.py +++ b/utils.py @@ -1,6 +1,6 @@ # Utility functions # Copyright (C) 2000 James Troup -# $Id: utils.py,v 1.2 2000-11-25 04:18:30 troup Exp $ +# $Id: utils.py,v 1.12 2001-01-25 06:00:07 troup Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ nk_format_exc = "Unknown Format: in .changes file"; no_files_exc = "No Files: field in .dsc file."; cant_open_exc = "Can't read file."; unknown_hostname_exc = "Unknown hostname"; +cant_overwrite_exc = "Permission denied; can't overwrite existent file." ###################################################################################### @@ -53,6 +54,29 @@ def our_raw_input(): ###################################################################################### +# What a mess. FIXME +def extract_component_from_section(section): + component = ""; + + if string.find(section, '/') != -1: + component = string.split(section, '/')[0]; + if string.lower(component) == "non-us" and string.count(section, '/') > 0: + s = string.split(section, '/')[1]; + if s == "main" or s == "non-free" or s == "contrib": # Avoid e.g. non-US/libs + component = string.split(section, '/')[0]+ '/' + string.split(section, '/')[1]; + + if string.lower(section) == "non-us": + component = "non-US/main"; + + if component == "": + component = "main"; + elif string.lower(component) == "non-us": + component = "non-US/main"; + + return (section, component); + +###################################################################################### + def parse_changes(filename): changes_in = open_file(filename,'r'); error = "" @@ -103,30 +127,19 @@ def build_file_list(changes, dsc): if i == "": break s = string.split(i) - section = priority = component = "" - if dsc != "": - (md5, size, name) = s - else: - (md5, size, section, priority, name) = s + section = priority = ""; + try: + if dsc != "": + (md5, size, name) = s + else: + (md5, size, section, priority, name) = s + except ValueError: + raise changes_parse_error_exc, i if section == "": section = "-" if priority == "": priority = "-" - # What a mess. FIXME - if string.find(section, '/') != -1: - component = string.split(section, '/')[0] - if string.lower(component) == "non-us" and string.count(section, '/') > 1: - s = string.split(section, '/')[1] - if s == "main" or s == "non-free" or s == "contrib": # Avoid e.g. non-US/libs - component = string.split(section, '/')[0]+ '/' + string.split(section, '/')[1] - - if string.lower(section) == "non-us": - component = "non-US/main"; - - if component == "": - component = "main"; - elif string.lower(component) == "non-us": - component = "non-US/main"; + (section, component) = extract_component_from_section(section); files[name] = { "md5sum" : md5, "size" : size, @@ -188,6 +201,9 @@ def send_mail (message, filename): def poolify (source, component): if component != "": component = component + '/'; + # FIXME: this is nasty + component = string.lower(component); + component = string.replace(component, 'non-us/', 'non-US/'); if source[:3] == "lib": return component + source[:4] + '/' + source + '/' else: @@ -196,7 +212,7 @@ def poolify (source, component): ###################################################################################### def move (src, dest): - if os.path.exists(dest) and stat.S_ISDIR(os.stat(dest)[stat.ST_MODE]): + if os.path.exists(dest) and os.path.isdir(dest): dest_dir = dest; else: dest_dir = os.path.dirname(dest); @@ -205,10 +221,32 @@ def move (src, dest): os.makedirs(dest_dir, 02775); os.umask(umask); #print "Moving %s to %s..." % (src, dest); + if os.path.exists(dest) and os.path.isdir(dest): + dest = dest + '/' + os.path.basename(src); + # Check for overwrite permission on existent files + if os.path.exists(dest) and not os.access(dest, os.W_OK): + raise cant_overwrite_exc shutil.copy2(src, dest); os.chmod(dest, 0664); os.unlink(src); +def copy (src, dest): + if os.path.exists(dest) and os.path.isdir(dest): + dest_dir = dest; + else: + dest_dir = os.path.dirname(dest); + if not os.path.exists(dest_dir): + umask = os.umask(00000); + os.makedirs(dest_dir, 02775); + os.umask(umask); + #print "Copying %s to %s..." % (src, dest); + if os.path.exists(dest) and os.path.isdir(dest): + dest = dest + '/' + os.path.basename(src); + if os.path.exists(dest) and not os.access(dest, os.W_OK): + raise cant_overwrite_exc + shutil.copy2(src, dest); + os.chmod(dest, 0664); + ###################################################################################### # FIXME: this is inherently nasty. Can't put this mapping in a conf @@ -219,7 +257,7 @@ def where_am_i (): res = socket.gethostbyaddr(socket.gethostname()); if res[0] == 'pandora.debian.org': return 'non-US'; - elif res[1] == 'auric.debian.org': + elif res[0] == 'auric.debian.org': return 'ftp-master'; else: raise unknown_hostname_exc, res; @@ -239,3 +277,21 @@ def which_conf_file (): ###################################################################################### +# Escape characters which have meaning to SQL's regex comparison operator ('~') +# (woefully incomplete) + +def regex_safe (s): + s = string.replace(s, '+', '\\\\+'); + return s + +###################################################################################### + +def size_type (c): + t = " b"; + if c > 10000: + c = c / 1000; + t = " Kb"; + if c > 10000: + c = c / 1000; + t = " Mb"; + return ("%d%s" % (c, t))