Hello community,
here is the log from the commit of package debootstrap for openSUSE:12.2
checked in at 2012-07-09 07:56:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/debootstrap (Old)
and /work/SRC/openSUSE:12.2/.debootstrap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "debootstrap", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:12.2/debootstrap/debootstrap.changes 2012-06-25
15:17:33.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.debootstrap.new/debootstrap.changes
2012-07-09 07:56:03.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Jul 6 19:46:00 UTC 2012 - frank.lichtenh...@sophos.com
+
+- update to 1.0.42
+* Downgrade the absence of an InRelease file from a warning to an info
+ message. (Ubuntu LP: #1017398)
+
+-------------------------------------------------------------------
+Sun Jun 24 16:11:52 UTC 2012 - frank.lichtenh...@sophos.com
+
+- update to 1.0.41
+* Add support for InRelease files (Debian Bug #638682)
+
+-------------------------------------------------------------------
Old:
----
debootstrap_1.0.40.tar.gz
New:
----
debootstrap_1.0.42.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ debootstrap.spec ++++++
--- /var/tmp/diff_new_pack.IEo8jT/_old 2012-07-09 07:56:03.000000000 +0200
+++ /var/tmp/diff_new_pack.IEo8jT/_new 2012-07-09 07:56:03.000000000 +0200
@@ -1,6 +1,7 @@
#
# spec file for package debootstrap
#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 Frank Lichtenheld <fr...@lichtenheld.de>
#
# All modifications and additions to the file contributed by third parties
@@ -17,7 +18,7 @@
Name: debootstrap
-Version: 1.0.40
+Version: 1.0.42
Release: 0
Summary: Bootstrap a basic Debian system
License: MIT
++++++ debootstrap_1.0.40.tar.gz -> debootstrap_1.0.42.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/debootstrap-1.0.40/debian/changelog
new/debootstrap-1.0.42/debian/changelog
--- old/debootstrap-1.0.40/debian/changelog 2012-04-26 18:44:49.000000000
+0200
+++ new/debootstrap-1.0.42/debian/changelog 2012-07-03 16:35:00.000000000
+0200
@@ -1,3 +1,19 @@
+debootstrap (1.0.42) unstable; urgency=low
+
+ * Downgrade the absence of an InRelease file from a warning to an info
+ message. For now, debootstrap can cope fine without, and it's possible
+ there are Debian mirrors that don't have InRelease; Ubuntu doesn't quite
+ have InRelease support yet either (LP: #1017398).
+
+ -- Colin Watson <cjwat...@debian.org> Tue, 03 Jul 2012 15:34:57 +0100
+
+debootstrap (1.0.41) unstable; urgency=low
+
+ [ Mehdi Dogguy ]
+ * Add support for InRelease files (Closes: #638682)
+
+ -- Joey Hess <jo...@debian.org> Thu, 21 Jun 2012 13:16:22 -0400
+
debootstrap (1.0.40) unstable; urgency=low
[ Joey Hess ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/debootstrap-1.0.40/functions
new/debootstrap-1.0.42/functions
--- old/debootstrap-1.0.40/functions 2012-04-26 16:39:51.000000000 +0200
+++ new/debootstrap-1.0.42/functions 2012-06-25 11:12:50.000000000 +0200
@@ -480,57 +480,82 @@
done | head -n 1
}
+extract_release_components () {
+ local reldest="$1"; shift
+ TMPCOMPONENTS="$(sed -n 's/Components: *//p' "$reldest")"
+ for c in $TMPCOMPONENTS ; do
+ eval "
+ case \"\$c\" in
+ $USE_COMPONENTS)
+ COMPONENTS=\"\$COMPONENTS \$c\"
+ ;;
+ esac
+ "
+ done
+ COMPONENTS="$(echo $COMPONENTS)"
+ if [ -z "$COMPONENTS" ]; then
+ mv "$reldest" "$reldest.malformed"
+ error 1 INVALIDREL "Invalid Release file, no valid components"
+ fi
+}
+
download_release_sig () {
local m1="$1"
local reldest="$2"
- local relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1"
"dists/$SUITE/Release.gpg")"
+ local relsigdest="$3"
+ local release_file_variant="$4"
if [ -n "$KEYRING" ] && [ -z "$DISABLE_KEYRING" ]; then
- progress 0 100 DOWNRELSIG "Downloading Release file signature"
- progress_next 50
- get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" nocache ||
- error 1 NOGETRELSIG "Failed getting release signature
file %s" \
- "$m1/dists/$SUITE/Release.gpg"
- progress 50 100 DOWNRELSIG "Downloading Release file signature"
+ if [ "$release_file_variant" != "IN" ]; then
+ progress 0 100 DOWNRELSIG "Downloading Release file
signature"
+ progress_next 50
+ get "$m1/dists/$SUITE/Release.gpg" "$relsigdest"
nocache ||
+ error 1 NOGETRELSIG "Failed getting release
signature file %s" \
+ "$m1/dists/$SUITE/Release.gpg"
+ progress 50 100 DOWNRELSIG "Downloading Release file
signature"
+ fi
info RELEASESIG "Checking Release signature"
# Don't worry about the exit status from gpgv; parsing the
output will
# take care of that.
- (gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict
\
- "$relsigdest" "$reldest" || true) | read_gpg_status
+ if [ "$release_file_variant" = "IN" ]; then
+ (gpgv --status-fd 1 --keyring "$KEYRING"
--ignore-time-conflict \
+ "$relsigdest" || true) | read_gpg_status
+ else
+ (gpgv --status-fd 1 --keyring "$KEYRING"
--ignore-time-conflict \
+ "$relsigdest" "$reldest" || true) | read_gpg_status
+ fi
progress 100 100 DOWNRELSIG "Downloading Release file signature"
elif [ -z "$DISABLE_KEYRING" ] && [ -n "$KEYRING_WANTED" ]; then
warning KEYRING "Cannot check Release signature; keyring file
not available %s" "$KEYRING_WANTED"
fi
+ if [ "$release_file_variant" = "IN" ]; then
+ mv "$relsigdest" "$reldest"
+ fi
}
download_release_indices () {
local m1="${MIRRORS%% *}"
local reldest="$TARGET/$($DLDEST rel "$SUITE" "$m1"
"dists/$SUITE/Release")"
+ local inreldest="$TARGET/$($DLDEST rel "$SUITE" "$m1"
"dists/$SUITE/InRelease")"
+ local relsigdest
+ local release_file_variant="IN"
progress 0 100 DOWNREL "Downloading Release file"
progress_next 100
- get "$m1/dists/$SUITE/Release" "$reldest" nocache ||
- error 1 NOGETREL "Failed getting release file %s"
"$m1/dists/$SUITE/Release"
-
- TMPCOMPONENTS="$(sed -n 's/Components: *//p' "$reldest")"
- for c in $TMPCOMPONENTS ; do
- eval "
- case \"\$c\" in
- $USE_COMPONENTS)
- COMPONENTS=\"\$COMPONENTS \$c\"
- ;;
- esac
- "
- done
- COMPONENTS="$(echo $COMPONENTS)"
-
- if [ -z "$COMPONENTS" ]; then
- mv "$reldest" "$reldest.malformed"
- error 1 INVALIDREL "Invalid Release file, no valid components"
+ if get "$m1/dists/$SUITE/InRelease" "$inreldest" nocache; then
+ extract_release_components $inreldest
+ relsigdest="$inreldest"
+ else
+ info RETRIEVING "Failed to retrieve InRelease"
+ get "$m1/dists/$SUITE/Release" "$reldest" nocache ||
+ error 1 NOGETREL "Failed getting release file %s"
"$m1/dists/$SUITE/Release"
+ release_file_variant="GPG"
+ relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1"
"dists/$SUITE/Release.gpg")"
+ extract_release_components $reldest
fi
progress 100 100 DOWNREL "Downloading Release file"
- download_release_sig "$m1" "$reldest"
+ download_release_sig "$m1" "$reldest" "$relsigdest"
"$release_file_variant"
local totalpkgs=0
for c in $COMPONENTS; do
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
