From 124f70b3f9093b1dece137d30967a8ebbc711484f13ab10566456ded70de9dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 25 May 2011 15:48:10 +0000 Subject: [PATCH] fix for server side run OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-source_validator?expand=0&rev=7 --- ...pec_file:obs-service-source_validator.spec | 61 ------------------- obs-service-source_validator.changes | 5 ++ source_validator | 6 +- 3 files changed, 10 insertions(+), 62 deletions(-) delete mode 100644 _service:format_spec_file:obs-service-source_validator.spec diff --git a/_service:format_spec_file:obs-service-source_validator.spec b/_service:format_spec_file:obs-service-source_validator.spec deleted file mode 100644 index 3545ab7..0000000 --- a/_service:format_spec_file:obs-service-source_validator.spec +++ /dev/null @@ -1,61 +0,0 @@ -# -# spec file for package obs-service-source_validator -# -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - - -Name: obs-service-source_validator -License: GPL v2 or later -Group: Development/Tools/Building -Summary: An OBS source service: running all the osc source-validator checks -Version: 0.1 -Release: 1 -Source: source_validator -Source1: source_validator.service -Requires: osc-source_validator -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - - -%description -This is a source service for openSUSE Build Service. - -This service runs all checks from osc-source_validator. This can be used -to guarantee that all checks succeed also on the service side. This plugin can be -used via project wide defined services. - -%prep - -%setup -q -D -T 0 -n . - - -%build - - -%install -mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service -install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT/usr/lib/obs/service -install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service - - -%files -%defattr(-,root,root) -%dir /usr/lib/obs -/usr/lib/obs/service - - - -%changelog diff --git a/obs-service-source_validator.changes b/obs-service-source_validator.changes index ad307eb..d993c70 100644 --- a/obs-service-source_validator.changes +++ b/obs-service-source_validator.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 25 15:47:48 UTC 2011 - adrian@suse.de + +- make service runable on server side as well + ------------------------------------------------------------------- Wed May 25 13:07:45 UTC 2011 - adrian@suse.de diff --git a/source_validator b/source_validator index f399d95..5f8b6b4 100644 --- a/source_validator +++ b/source_validator @@ -24,7 +24,11 @@ FILE="${PATH##*/}" RETURN=0 for i in /usr/lib/osc/source_validators/*; do if [ -f "$i" ]; then - "$i" || RETURN=1 + if [ -z "$PS1" ]; then + "$i" --batchmode || RETURN=1 + else + "$i" || RETURN=1 + fi fi done