Restore old --auto-publish, update spec to current state of art

This commit is contained in:
Denis Silakov 2014-03-07 11:53:20 +04:00
parent bcd42192eb
commit 8d501f5834
2 changed files with 6 additions and 7 deletions

View file

@ -1,5 +1,5 @@
Name: abf-console-client
Version: 1.11
Version: 1.14.1
Release: 1
Summary: Console client for ABF (https://abf.rosalinux.ru)
Group: System/Configuration/Packaging
@ -21,7 +21,6 @@ Suggests: mock-urpm
Console client for ABF (https://abf.rosalinux.ru).
%package -n python-abf
Summary: Python API for ABF (https://abf.rosalinux.ru)
Group: System/Configuration/Packaging
@ -33,18 +32,15 @@ It contains a set of basic operations, done with either HTML
parsing or through ABF json API. It also provides datamodel to
operate with.
%prep
%setup -q -n %{name}
%install
rm -rf %{buildroot}
make install DESTDIR=$RPM_BUILD_ROOT
make install DESTDIR=%{buildroot}
ln -s %{_datadir}/bash-completion/abf %{buildroot}/%{_sysconfdir}/bash_completion.d/abf
%files
%defattr(-,root,root,-)
%dir %{py_puresitedir}/abf/console
%{py_puresitedir}/abf/console/*.py*
%{_bindir}/abf
@ -61,7 +57,6 @@ ln -s %{_datadir}/bash-completion/abf %{buildroot}/%{_sysconfdir}/bash_completio
%dir /var/lib/abf/mock-urpm
%files -n python-abf
%defattr(-,root,root,-)
%dir %{py_puresitedir}/abf
%dir %{py_puresitedir}/abf/api
%{py_puresitedir}/abf/*.py*

4
abf.py
View file

@ -190,6 +190,7 @@ def parse_command_line():
parser_build.add_argument('-r', '--repository', action='append', help='repositories to build with ([platform/]repository). '
'Can be set more than once. If no platform part specified, it is assumed to be your "<default_build_platform>".'
' If no repositories were specified at all, use the "main" repository from save-to platform.')
parser_build.add_argument('--auto-publish', action='store_true', help='deprecated synonym for --auto-publish-status=default.')
parser_build.add_argument('--auto-publish-status', action='store', choices=BuildList.auto_publish_statuses, help='enable automatic publishing. Default is "%s".' %
(BuildList.auto_publish_statuses[0]))
parser_build.add_argument('--skip-personal', action='store_true', help='do not use personal repository to resolve dependencies.')
@ -1060,6 +1061,9 @@ def build():
if auto_create_container is None:
auto_create_container = True
if command_line.auto_publish and not command_line.auto_publish_status:
command_line.auto_publish_status = 'default'
build_ids = BuildList.new_build_task(
models,
proj,