X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=fd790b5930df56d0e49804a13178db33f7bca090;hb=aa63ea6814c83460abc4417f52ffdf5232431dd6;hp=b20a063a452d4e9d1354f8e4a19c519205855295;hpb=b34e1454c174ccc89f552a0871fbf18e19a01264;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index b20a063a..fd790b59 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -234,6 +234,10 @@ def parse_changes(filename, signing_rules=0): changes_in = open_file(filename) content = changes_in.read() changes_in.close() + try: + unicode(content, 'utf-8') + except UnicodeError: + raise ChangesUnicodeError, "Changes file not proper utf-8" return parse_deb822(content, signing_rules) ################################################################################ @@ -1494,6 +1498,25 @@ def is_email_alias(email): ################################################################################ +def get_changes_files(dir): + """ + Takes a directory and lists all .changes files in it (as well as chdir'ing + to the directory; this is due to broken behaviour on the part of p-u/p-a + when you're not in the right place) + + Returns a list of filenames + """ + try: + # Much of the rest of p-u/p-a depends on being in the right place + os.chdir(dir) + changes_files = [x for x in os.listdir(dir) if x.endswith('.changes')] + except OSError, e: + fubar("Failed to read list from directory %s (%s)" % (dir, e)) + + return changes_files + +################################################################################ + apt_pkg.init() Cnf = apt_pkg.newConfiguration()