X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fcommand.py;h=867f7e3692589a5c26d1f1bc059cb40d7a62298f;hb=46c004587d4467079853324c53a927c25823f5fd;hp=c1f9c706e02a443145c2065f5cc66850d9e5952b;hpb=1eeb90f6bf381e10fcd8f0a04437883b443855d5;p=dak.git diff --git a/daklib/command.py b/daklib/command.py index c1f9c706..867f7e36 100644 --- a/daklib/command.py +++ b/daklib/command.py @@ -158,6 +158,8 @@ class CommandFile(object): section = sections.section if 'Uploader' in section: self.uploader = section['Uploader'] + if 'Cc' in section: + self.cc.append(section['Cc']) # TODO: Verify first section has valid Archive field if 'Archive' not in section: raise CommandError('No Archive field in first section.') @@ -306,13 +308,13 @@ class CommandFile(object): self.log.log(['dm-migrate', 'from={0}'.format(fpr_hash_from), 'to={0}'.format(fpr_hash_to)]) - count = 0 + sources = [] for entry in session.query(ACLPerSource).filter_by(acl=acl, fingerprint=fpr_from): self.log.log(['dm-migrate', 'from={0}'.format(fpr_hash_from), 'to={0}'.format(fpr_hash_to), 'source={0}'.format(entry.source)]) entry.fingerprint = fpr_to - count += 1 + sources.append(entry.source) - self.result.append('Migrated {0} to {1}.\n{2} acl entries changed.'.format(fpr_hash_from, fpr_hash_to, count)) + self.result.append('Migrated {0} to {1}.\n{2} acl entries changed: {3}'.format(fpr_hash_from, fpr_hash_to, len(sources), ", ".join(sources))) session.commit()