diff options
| author | 2016-04-10 11:28:01 +0200 | |
|---|---|---|
| committer | 2016-04-10 11:28:01 +0200 | |
| commit | cddf83890330ab724bded96614ef8ffcc2c47656 (patch) | |
| tree | 92e2c1a015370ad5949d0f0c2710869ec235c4d9 | |
| parent | aad441a57ae500cdb1985d12bbab85e6da1732fc (diff) | |
Add option backport_release to the configuration file.
If this option is set mini-dinstall writes
"NotAutomatic: yes" and "ButAutomaticUpgrades: yes"
to the Release file.
Closes: #820582
| -rw-r--r-- | doc/mini-dinstall.1 | 7 | ||||
| -rwxr-xr-x | mini-dinstall | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/mini-dinstall.1 b/doc/mini-dinstall.1 index 89172cb..d37e071 100644 --- a/doc/mini-dinstall.1 +++ b/doc/mini-dinstall.1 @@ -299,8 +299,13 @@ The Origin field in the Release file. Defaults to the current user's username. .B release_suite The Suite field in the Release file. Defaults to \*(lqNone\*(rq. .TP +.B backport_release +The backport_release field marks the release as backport. +Defaults to \*(lq0\*(rq. .B experimental_release -The experimental_release field mark the release as experimental. Defaults to \*(lq0\*(rq. +The experimental_release field marks the release as experimental. +Defaults to \*(lq0\*(rq. +If this option is set, it overrides the option backport_release. .TP .B release_signscript If specified, this script will be called to sign Release files. It will be diff --git a/mini-dinstall b/mini-dinstall index 9827c8c..1efc9e9 100755 --- a/mini-dinstall +++ b/mini-dinstall @@ -385,6 +385,7 @@ class DistOptionHandler: self._optionmap['release_suite'] = ['str', None] self._optionmap['release_codename'] = ['str', None] self._optionmap['experimental_release'] = ['bool', 0] + self._optionmap['backport_release'] = ['bool', 0] self._optionmap['release_description'] = ['str', None] self._optionmap['release_signscript'] = ['str', None] self._optionmap['keyrings'] = ['list', None] @@ -1421,6 +1422,9 @@ class SimpleSubdirArchiveDirIndexer(ArchiveDirIndexer): f.write('Codename: ' + '%s/%s\n' % (codename, arch)) if self._experimental_release: f.write('NotAutomatic: yes\n') + elif self._backport_release: + f.write('NotAutomatic: yes\n') + f.write('ButAutomaticUpgrades: yes\n') f.write('Date: ' + time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime()) + '\n') f.write('Architectures: ' + arch + '\n') if self._release_description: @@ -1522,6 +1526,9 @@ class FlatArchiveDirIndexer(ArchiveDirIndexer): f.write('Codename: ' + codename + '\n') if self._experimental_release: f.write('NotAutomatic: yes\n') + elif self._backport_release: + f.write('NotAutomatic: yes\n') + f.write('ButAutomaticUpgrades: yes\n') f.write('Date: ' + time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime()) + '\n') f.write('Architectures: ' + string.join(self._arches, ' ') + '\n') if self._release_description: |
