[prev in list] [next in list] [prev in thread] [next in thread]
List: opensuse-commit
Subject: commit yast2-packager
From: root () Hilbert ! suse ! de (h_root)
Date: 2008-11-29 22:24:07
Message-ID: 20081129222408.1AFD867803F () Hilbert ! suse ! de
[Download RAW message or body]
Hello community,
here is the log from the commit of package yast2-packager
checked in at Sat Nov 29 23:24:07 CET 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-11-28 12:19:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-11-28 \
18:26:03.462957000 +0100 @@ -1,0 +2,7 @@
+Fri Nov 28 18:15:42 CET 2008 - lslezak@suse.cz
+
+- fixed changing status of the repositories belonging to a service
+ (bnc#444366)
+- 2.17.50
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.17.49.tar.bz2
New:
----
yast2-packager-2.17.50.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.o20919/_old 2008-11-29 23:24:00.000000000 +0100
+++ /var/tmp/diff_new_pack.o20919/_new 2008-11-29 23:24:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.49)
+# spec file for package yast2-packager (Version 2.17.50)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-packager
-Version: 2.17.49
+Version: 2.17.50
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.49.tar.bz2
+Source0: yast2-packager-2.17.50.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@suse.de>
%prep
-%setup -n yast2-packager-2.17.49
+%setup -n yast2-packager-2.17.50
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,10 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Fri Nov 28 2008 lslezak@suse.cz
+- fixed changing status of the repositories belonging to a service
+ (bnc#444366)
+- 2.17.50
* Fri Nov 28 2008 locilka@suse.cz
- DefaultDesktop module now returns desktop name translated using
the current language (bnc #449818).
++++++ yast2-packager-2.17.49.tar.bz2 -> yast2-packager-2.17.50.tar.bz2 ++++++
++++ 3277 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
--exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' \
--exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp \
--exclude install-sh --exclude ltmain.sh old/yast2-packager-2.17.49/configure.in \
new/yast2-packager-2.17.50/configure.in
--- old/yast2-packager-2.17.49/configure.in 2008-10-09 19:19:24.000000000 +0200
+++ new/yast2-packager-2.17.50/configure.in 2008-11-28 18:23:41.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.27, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.50, 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.27"
+VERSION="2.17.50"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak@suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
--exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' \
--exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp \
--exclude install-sh --exclude ltmain.sh \
old/yast2-packager-2.17.49/src/clients/repositories.ycp \
new/yast2-packager-2.17.50/src/clients/repositories.ycp
--- old/yast2-packager-2.17.49/src/clients/repositories.ycp 2008-11-13 \
10:27:31.000000000 +0100
+++ new/yast2-packager-2.17.50/src/clients/repositories.ycp 2008-11-28 \
18:23:36.000000000 +0100 @@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 53216 2008-11-12 14:41:54Z lslezak $
+ * $Id: repositories.ycp 53744 2008-11-28 17:23:35Z lslezak $
*
*/
@@ -442,8 +442,53 @@
}
boolean Write() {
- y2milestone("New config: %1", sourceStatesOut);
- boolean success = Pkg::SourceEditSet( sourceStatesOut );
+ boolean success = true;
+
+ // evaluate removed and new services
+ list<string> deleted_services = newServices(serviceStatesOut, serviceStatesIn);
+ y2milestone("Deleted services: %1", deleted_services);
+ list<string> added_services = newServices(serviceStatesIn, serviceStatesOut);
+ y2milestone("Added services: %1", added_services);
+
+ foreach(string alias, deleted_services,
+ {
+ y2milestone("Removing service %1", alias);
+ success = success && Pkg::ServiceDelete(alias);
+ }
+ );
+
+ y2milestone("New service config: %1", sourceStatesOut);
+ foreach(map<string,any> s, serviceStatesOut,
+ {
+ string alias = s["alias"]:"";
+
+ if (contains(added_services, alias))
+ {
+ y2milestone("Adding service %1", alias);
+ string new_url = s["url"]:"";
+
+ if (new_url != "")
+ {
+ y2milestone("aliases: %1", Pkg::ServiceAliases());
+ success = success && Pkg::ServiceAdd(alias, new_url);
+ // set enabled and autorefresh flags
+ success = success && Pkg::ServiceSet(alias, s);
+ }
+ else
+ {
+ y2error("Empty URL for service %1", alias);
+ }
+ }
+ else
+ {
+ y2milestone("Modifying service %1", alias);
+ success = success && Pkg::ServiceSet(alias, s);
+ }
+ }
+ );
+
+ y2milestone("New repo config: %1", sourceStatesOut);
+ success = success && Pkg::SourceEditSet( sourceStatesOut );
// we must sync before the repositories are deleted from zypp
// otherwise we will not get their details
@@ -488,48 +533,6 @@
}
);
- // evaluate removed and new services
- list<string> deleted_services = newServices(serviceStatesOut, serviceStatesIn);
- y2milestone("Deleted services: %1", deleted_services);
- list<string> added_services = newServices(serviceStatesIn, serviceStatesOut);
- y2milestone("Added services: %1", added_services);
-
- foreach(string alias, deleted_services,
- {
- y2milestone("Removing service %1", alias);
- success = success && Pkg::ServiceDelete(alias);
- }
- );
-
- foreach(map<string,any> s, serviceStatesOut,
- {
- string alias = s["alias"]:"";
-
- if (contains(added_services, alias))
- {
- y2milestone("Adding service %1", alias);
- string new_url = s["url"]:"";
-
- if (new_url != "")
- {
- y2milestone("aliases: %1", Pkg::ServiceAliases());
- success = success && Pkg::ServiceAdd(alias, new_url);
- // set enabled and autorefresh flags
- success = success && Pkg::ServiceSet(alias, s);
- }
- else
- {
- y2error("Empty URL for service %1", alias);
- }
- }
- else
- {
- y2milestone("Modifying service %1", alias);
- success = success && Pkg::ServiceSet(alias, s);
- }
- }
- );
-
success = success && KeyManager::Write();
// store repositories and services in the persistent libzypp storage
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore \
--exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' \
--exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp \
--exclude install-sh --exclude ltmain.sh old/yast2-packager-2.17.49/VERSION \
new/yast2-packager-2.17.50/VERSION
--- old/yast2-packager-2.17.49/VERSION 2008-11-27 18:23:11.000000000 +0100
+++ new/yast2-packager-2.17.50/VERSION 2008-11-28 18:16:41.000000000 +0100
@@ -1 +1 @@
-2.17.49
+2.17.50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic