Hello community,

here is the log from the commit of package obs-service-download_files for 
openSUSE:Factory
checked in at Mon Jul 11 15:48:21 CEST 2011.



--------
--- obs-service-download_files/obs-service-download_files.changes       
2011-05-24 17:31:48.000000000 +0200
+++ 
/mounts/work_src_done/STABLE/obs-service-download_files/obs-service-download_files.changes
  2011-07-05 13:51:52.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jul  5 11:40:56 UTC 2011 - [email protected]
+
+- Improve error reporting on illegal URLs
+- fix "same file as committed" detection
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  _service:format_spec_file:obs-service-download_files.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ _service:format_spec_file:obs-service-download_files.spec ++++++
#
# spec file for package obs-service-download_files
#
# 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-download_files
License:        GPL v2 or later
Group:          Development/Tools/Building
Summary:        An OBS source service: download files
Version:        0.1
Release:        1
Source:         download_files
Source1:        download_files.service
Requires:       wget diffutils
Requires:       build >= 2011.05.24
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildArch:      noarch

%description
This is a source service for openSUSE Build Service.

This service is parsing all spec files and downloads all Source files which are 
specified via a http, https or ftp url.

%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
++++++ obs-service-download_files.spec ++++++
--- /var/tmp/diff_new_pack.RuBKWS/_old  2011-07-11 15:48:00.000000000 +0200
+++ /var/tmp/diff_new_pack.RuBKWS/_new  2011-07-11 15:48:00.000000000 +0200
@@ -22,7 +22,7 @@
 Group:          Development/Tools/Building
 Summary:        An OBS source service: download files
 Version:        0.1
-Release:        1
+Release:        3
 Source:         download_files
 Source1:        download_files.service
 Requires:       wget diffutils
@@ -49,4 +49,5 @@
 %defattr(-,root,root)
 %dir /usr/lib/obs
 /usr/lib/obs/service
+
 %changelog

++++++ download_files ++++++
--- /var/tmp/diff_new_pack.RuBKWS/_old  2011-07-11 15:48:00.000000000 +0200
+++ /var/tmp/diff_new_pack.RuBKWS/_new  2011-07-11 15:48:00.000000000 +0200
@@ -64,8 +64,12 @@
     fi
     cd "$MYOUTDIR"
     if [ -z "$DORECOMPRESS" ]; then
-      /usr/bin/wget -4 --no-check-certificate -q "$url" || exit 1
+      if ! /usr/bin/wget -4 --no-check-certificate -q "$url"; then
+        echo "ERROR: Fail to download $url"
+        exit 1
+      fi
       RECOMPRESS=""
+      FILE="${url##*/}"
     else
       FORMAT="${url##*\.}"
       if /usr/bin/wget -4 --no-check-certificate -q "$url"; then
@@ -81,8 +85,8 @@
         RECOMPRESS="$FORMAT"
         FILE="${url%$FORMAT}xz"
       else
-        RECOMPRESS=""
-        RETURN=1
+        echo "ERROR: Fail to download $url or any other compression format"
+        exit 1
       fi
       FILE="${FILE##*/}"
     fi


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to