Mailinglist Archive: opensuse-commit (817 mails)
| < Previous | Next > |
commit yast2-packager for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 16 Dec 2008 17:57:40 +0100
- Message-id: <20081216165740.63A0767815D@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at Tue Dec 16 17:57:40 CET 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-12-16 14:31:52.000000000
+0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes
2008-12-16 15:27:49.058538000 +0100
@@ -1,0 +2,7 @@
+Tue Dec 16 15:14:41 CET 2008 - lslezak@xxxxxxx
+
+- do not remove repositories belonging to an already removed
+ service (service removal failed) (bnc#459413)
+- 2.17.54
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.17.53.tar.bz2
New:
----
yast2-packager-2.17.54.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.X26310/_old 2008-12-16 17:57:30.000000000 +0100
+++ /var/tmp/diff_new_pack.X26310/_new 2008-12-16 17:57:30.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.53)
+# spec file for package yast2-packager (Version 2.17.54)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-packager
-Version: 2.17.53
+Version: 2.17.54
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.53.tar.bz2
+Source0: yast2-packager-2.17.54.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files
yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# HTTP.ycp
@@ -78,7 +78,7 @@
Arvin Schnell <arvin@xxxxxxx>
%prep
-%setup -n yast2-packager-2.17.53
+%setup -n yast2-packager-2.17.54
%build
%{prefix}/bin/y2tool y2autoconf
@@ -113,7 +113,12 @@
/usr/share/YaST2/scrconf/*
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
+
%changelog
+* Tue Dec 16 2008 lslezak@xxxxxxx
+- do not remove repositories belonging to an already removed
+ service (service removal failed) (bnc#459413)
+- 2.17.54
* Tue Dec 16 2008 locilka@xxxxxxx
- Fixed progress when adding community repositories (bnc #459391).
- 2.17.53
++++++ yast2-packager-2.17.53.tar.bz2 -> yast2-packager-2.17.54.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.17.53/configure
new/yast2-packager-2.17.54/configure
--- old/yast2-packager-2.17.53/configure 2008-12-16 14:40:08.000000000
+0100
+++ new/yast2-packager-2.17.54/configure 2008-12-16 15:22:24.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-packager 2.17.53.
+# Generated by GNU Autoconf 2.63 for yast2-packager 2.17.54.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.17.53'
-PACKAGE_STRING='yast2-packager 2.17.53'
+PACKAGE_VERSION='2.17.54'
+PACKAGE_STRING='yast2-packager 2.17.54'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-packager 2.17.53 to adapt to many kinds of
systems.
+\`configure' configures yast2-packager 2.17.54 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,7 +1345,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.17.53:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.17.54:";;
esac
cat <<\_ACEOF
@@ -1425,7 +1425,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.17.53
+yast2-packager configure 2.17.54
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1439,7 +1439,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-packager $as_me 2.17.53, which was
+It was created by yast2-packager $as_me 2.17.54, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2286,7 +2286,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.17.53'
+ VERSION='2.17.54'
cat >>confdefs.h <<_ACEOF
@@ -2510,7 +2510,7 @@
-VERSION="2.17.53"
+VERSION="2.17.54"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak@xxxxxxx>"
@@ -3451,7 +3451,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.17.53, which was
+This file was extended by yast2-packager $as_me 2.17.54, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3501,7 +3501,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-packager config.status 2.17.53
+yast2-packager config.status 2.17.54
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.17.53/configure.in
new/yast2-packager-2.17.54/configure.in
--- old/yast2-packager-2.17.53/configure.in 2008-12-16 14:40:06.000000000
+0100
+++ new/yast2-packager-2.17.54/configure.in 2008-12-16 15:22:18.000000000
+0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.17.53, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.54, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.53"
+VERSION="2.17.54"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak@xxxxxxx>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.17.53/src/clients/repositories.ycp
new/yast2-packager-2.17.54/src/clients/repositories.ycp
--- old/yast2-packager-2.17.53/src/clients/repositories.ycp 2008-12-15
14:12:39.000000000 +0100
+++ new/yast2-packager-2.17.54/src/clients/repositories.ycp 2008-12-16
15:20:48.000000000 +0100
@@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 54033 2008-12-10 14:54:20Z lslezak $
+ * $Id: repositories.ycp 54181 2008-12-16 14:20:47Z lslezak $
*
*/
@@ -57,6 +57,7 @@
list<integer> sourcesToDelete = [];
+ list<integer> reposFromDeletedServices = [];
// Do not sync the changes to ZENworks even if rug is present
// This is handy for repairing an already out-of-sync situation
@@ -520,7 +521,14 @@
}
foreach( integer id, sourcesToDelete, ``{
- success = success && Pkg::SourceDelete(id);
+ if (contains(reposFromDeletedServices, id))
+ {
+ y2milestone("Repository %1 has been already removed (belongs to
a deleted service)", id);
+ }
+ else
+ {
+ success = success && Pkg::SourceDelete(id);
+ }
});
foreach(map<string,any> src_state, sourceStatesOut,
@@ -628,6 +636,7 @@
if (srcstate["SrcId"]:-1 == srcid)
{
y2milestone("Removing repository %1", srcstate);
+ reposFromDeletedServices =
add(reposFromDeletedServices, srcid);
return false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-packager-2.17.53/VERSION
new/yast2-packager-2.17.54/VERSION
--- old/yast2-packager-2.17.53/VERSION 2008-12-16 14:31:46.000000000 +0100
+++ new/yast2-packager-2.17.54/VERSION 2008-12-16 15:14:58.000000000 +0100
@@ -1 +1 @@
-2.17.53
+2.17.54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |