X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/9693ff43ed669ec93b40b3bb2b62482ec5dbfdf7..f85d143fe449d69d6f611fcd388191a80bdfc415:/hippotatlib/ownsource.py diff --git a/hippotatlib/ownsource.py b/hippotatlib/ownsource.py index 8ecc7f2..8e30979 100644 --- a/hippotatlib/ownsource.py +++ b/hippotatlib/ownsource.py @@ -5,22 +5,25 @@ # # Copyright 2017 Ian Jackson # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version, with the "CAF Login -# Exception" as published by Ian Jackson (version 2, or at your option -# any later version) as an Additional Permission. +# AGPLv3+ + CAFv2+ # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU Affero General Public +# License as published by the Free Software Foundation, either +# version 3 of the License, or (at your option) any later version, +# with the "CAF Login Exception" as published by Ian Jackson +# (version 2, or at your option any later version) as an Additional +# Permission. # -# You should have received a copy of the GNU Affero General Public -# License and the CAF Login Exception along with this program, in the -# file AGPLv3+CAFv2. If not, email Ian Jackson -# . +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public +# License and the CAF Login Exception along with this program, in +# the file AGPLv3+CAFv2. If not, email Ian Jackson +# . import os @@ -50,7 +53,7 @@ class SourceShipmentPreparer(): s.cwd = os.getcwd() s.find_rune_base = "find -type f -perm -004 \! -path '*/tmp/*'" s.ignores = ['*~', '*.bak', '*.tmp', '#*#', '__pycache__', - '[0-9][0-9][0-9][0-9]-src.cpio'] + '[0-9][0-9][0-9][0-9]-src.tar'] s.rune_shell = ['/bin/bash', '-ec'] s.show_pathnames = True s.download_packages = True @@ -183,7 +186,7 @@ class SourceShipmentPreparer(): find_rune = s.srcdir_find_rune(d) total_rune = s.rune_cpio % find_rune - name = s.new_output_name('src.cpio', infol) + name = s.new_output_name('src.tar', infol) s._dirmap[d] = name fh = s.open_output_fh(name, 'wb')