Hello community,
here is the log from the commit of package yast2-registration
checked in at Tue Nov 18 14:21:29 CET 2008.
--------
--- yast2-registration/yast2-registration.changes 2008-11-11 16:36:29.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-registration/yast2-registration.changes 2008-11-18 00:13:29.814400000 +0100
@@ -1,0 +2,15 @@
+Fri Nov 14 17:55:56 CET 2008 - jdsn@suse.de
+
+- fix repo type definition for adding sources (bnc#444770)
+- remove deprecated unused function
+- add more debug logging
+- service changes should not enable all its catalogs
+- refresh services prior to repositories
+- 2.17.13
+
+-------------------------------------------------------------------
+Thu Nov 13 15:33:39 CET 2008 - jdsn@suse.de
+
+- fix empty install message (bnc#444638)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-registration-2.17.12.tar.bz2
New:
----
yast2-registration-2.17.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.q10092/_old 2008-11-18 14:20:33.000000000 +0100
+++ /var/tmp/diff_new_pack.q10092/_new 2008-11-18 14:20:33.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-registration (Version 2.17.12)
+# spec file for package yast2-registration (Version 2.17.13)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-registration
-Version: 2.17.12
+Version: 2.17.13
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-registration-2.17.12.tar.bz2
+Source0: yast2-registration-2.17.13.tar.bz2
Prefix: /usr
Requires: yast2 >= 2.17.0
Requires: yast2-packager >= 2.17.0
@@ -52,7 +52,7 @@
J. Daniel Schmidt
%prep
-%setup -n yast2-registration-2.17.12
+%setup -n yast2-registration-2.17.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -150,7 +150,17 @@
%files branding-openSUSE
%defattr(-,root,root)
%{prefix}/share/applications/YaST2/suse_register.desktop
+
%changelog
+* Fri Nov 14 2008 jdsn@suse.de
+- fix repo type definition for adding sources (bnc#444770)
+- remove deprecated unused function
+- add more debug logging
+- service changes should not enable all its catalogs
+- refresh services prior to repositories
+- 2.17.13
+* Thu Nov 13 2008 jdsn@suse.de
+- fix empty install message (bnc#444638)
* Tue Nov 11 2008 jdsn@suse.de
- fix error in sformat statement (bnc#443781)
- 2.17.12
++++++ yast2-registration-2.17.12.tar.bz2 -> yast2-registration-2.17.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.12/configure new/yast2-registration-2.17.13/configure
--- old/yast2-registration-2.17.12/configure 2008-11-11 16:45:13.000000000 +0100
+++ new/yast2-registration-2.17.13/configure 2008-11-14 18:34:53.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-registration 2.17.12.
+# Generated by GNU Autoconf 2.61 for yast2-registration 2.17.13.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-registration'
PACKAGE_TARNAME='yast2-registration'
-PACKAGE_VERSION='2.17.12'
-PACKAGE_STRING='yast2-registration 2.17.12'
+PACKAGE_VERSION='2.17.13'
+PACKAGE_STRING='yast2-registration 2.17.13'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-registration 2.17.12 to adapt to many kinds of systems.
+\`configure' configures yast2-registration 2.17.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-registration 2.17.12:";;
+ short | recursive ) echo "Configuration of yast2-registration 2.17.13:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-registration configure 2.17.12
+yast2-registration configure 2.17.13
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-registration $as_me 2.17.12, which was
+It was created by yast2-registration $as_me 2.17.13, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-registration'
- VERSION='2.17.12'
+ VERSION='2.17.13'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.12"
+VERSION="2.17.13"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-registration $as_me 2.17.12, which was
+This file was extended by yast2-registration $as_me 2.17.13, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-registration config.status 2.17.12
+yast2-registration config.status 2.17.13
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.12/configure.in new/yast2-registration-2.17.13/configure.in
--- old/yast2-registration-2.17.12/configure.in 2008-11-11 16:45:08.000000000 +0100
+++ new/yast2-registration-2.17.13/configure.in 2008-11-14 18:34:48.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-registration, 2.17.12, http://bugs.opensuse.org/, yast2-registration)
+AC_INIT(yast2-registration, 2.17.13, http://bugs.opensuse.org/, yast2-registration)
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.12"
+VERSION="2.17.13"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.12/src/clients/inst_suse_register.ycp new/yast2-registration-2.17.13/src/clients/inst_suse_register.ycp
--- old/yast2-registration-2.17.12/src/clients/inst_suse_register.ycp 2008-11-11 16:35:51.000000000 +0100
+++ new/yast2-registration-2.17.13/src/clients/inst_suse_register.ycp 2008-11-14 14:43:40.000000000 +0100
@@ -806,10 +806,12 @@
string removePackage = "xen-tools";
string xenDomU = _("Xen DomU detected.");
- string installMsg = xenDomU + "\n" + _("The following package needs to be installed.");
- string removeMsg = xenDomU + "\n" +
+ string installMsg = xenDomU + "<br>" + _("The following package needs to be installed.") +
+ "<br>" + sformat("%1", installPackage); // (bnc#444638)
+ string removeMsg = xenDomU + "<br>" +
sformat(_("To count this installation correctly the package %1 needs to be installed."), installPackage ) +
- "\n" + _("Therefore the following package needs to be removed first.");
+ "<br>" + _("Therefore the following package needs to be removed first.") +
+ "<br>" + sformat("%1", removePackage); // (bnc#444638)
Package::RemoveMsg(removePackage, removeMsg);
@@ -1045,7 +1047,7 @@
* 112: the initialization of SuseRegister failed; no special message is used for that though
* 113: the initialization if the target failed - no interaction with the package system possible
* 198: the system did not find any browser to let the user perform the manual interaction part of the registration
- * 199: unknown error uccurred (no longer used)
+ * 199: unknown error uccurred
*/
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.12/src/modules/Register.ycp new/yast2-registration-2.17.13/src/modules/Register.ycp
--- old/yast2-registration-2.17.12/src/modules/Register.ycp 2008-11-11 14:51:11.000000000 +0100
+++ new/yast2-registration-2.17.13/src/modules/Register.ycp 2008-11-14 18:15:02.000000000 +0100
@@ -923,25 +923,6 @@
-/*
- * add_update_sources
- *
- * read update sources from services file and add them to yast and zmd
- * @return a list of added URLs
- */
-global list<string> add_update_sources ()
-{
- if (!FileUtils::Exists (services_file))
- return [];
-
- // filters out empty items (#165860#c12)
- list<string> urls = String::NewlineItems (
- (string)SCR::Read(.target.string, services_file));
-
- return SourceManager::AddUpdateSources (urls);
-}
-
-
/*
* checkCatalogs
@@ -951,6 +932,8 @@
*/
global list<string> checkCatalogs(map taskList, string service)
{
+ y2debug("Task list of check catalogs for the service (%1): %2", service, taskList);
+
list<string> cSummary = [];
list<string> catalogToEnable = [];
list<string> catalogToDisable = [];
@@ -982,7 +965,7 @@
y2error("A catalog returned by SuseRegister has an invalid task: %1", catalog);
repoUpdateSuccessful = false;
}
- else if ( catDetail["TASK"]:"" == "le" || catDetail["TASK"]:"" == "le" )
+ else if ( catDetail["TASK"]:"" == "le" || catDetail["TASK"]:"" == "ld" )
{
y2milestone("According to SuseRegister a catalog does not need to be changed: %1 (%2)", catalog, service);
}
@@ -1012,6 +995,11 @@
serviceDetails["repos_to_enable"] = catalogToEnable;
serviceDetails["repos_to_disable"] = catalogToDisable;
+ // enabled flag must not be present - otherwise all catalogs will be activated
+ serviceDetails = remove(serviceDetails, "enabled");
+
+ y2debug("Setting service properties for service (%1): %2", service, serviceDetails);
+
if ( Pkg::ServiceSet(service, serviceDetails) )
{
y2milestone("Successfully updated the catalog settings of service: %1", service);
@@ -1046,6 +1034,8 @@
return [];
}
+ y2debug("Task list to update software repositories: %1", taskList);
+
list<string> summary = [];
list<map> currentSources = Pkg::SourceEditGet();
@@ -1096,9 +1086,8 @@
"name" : (string) ((map) pAny)["NAME"]:"",
"alias" : (string) ((map) pAny)["ALIAS"]:"",
"base_urls" : [ (string) ((map) pAny)["URL"]:"" ],
- "priority" : ((map) pAny)["PRIORITY"]:99,
- // ?? "prod_dir" : ((map) pAny)["PROD_DIR"]:"",
- "type" : (string) ((map) pAny)["TYPE"]:""
+ "priority" : ((map) pAny)["PRIORITY"]:99
+ // remove repo type (bnc#444770)
];
integer newSrcID = Pkg::RepositoryAdd( newSrcMap );
@@ -1317,17 +1306,17 @@
{
y2milestone("Changes to the repositories and services were successful. Now refreshing all of them.");
- list<integer> currentNewSources = Pkg::SourceGetCurrent( true );
- foreach (integer srcID, currentNewSources, {
- y2milestone("Refreshing source with ID: %1", srcID);
- Pkg::SourceForceRefreshNow(srcID);
- });
-
list<string> currentNewServices = Pkg::ServiceAliases();
foreach ( string serviceAlias, currentNewServices, {
y2milestone("Refreshing service with Alias: %1", serviceAlias);
Pkg::ServiceRefresh(serviceAlias);
});
+
+ list<integer> currentNewSources = Pkg::SourceGetCurrent( true );
+ foreach (integer srcID, currentNewSources, {
+ y2milestone("Refreshing source with ID: %1", srcID);
+ Pkg::SourceForceRefreshNow(srcID);
+ });
}
}
@@ -1355,8 +1344,11 @@
list<integer> allCurrentSources = [];
list<string> allCurrentServices = [];
+ map ui = UI::GetDisplayInfo();
+ boolean debugMode = (boolean) ui["y2debug"]:false;
+
map contextData = $[
- "debug" : 0,
+ "debug" : (debugMode ? 2:0),
"nooptional" : (submit_optional ? 0:1),
"nohwdata" : (submit_hwdata ? 0:1),
"forcereg" : (force_registration ? 1:0), // (bnc#443704)
@@ -1394,19 +1386,34 @@
y2milestone("Successfully initialized the target.");
isInitializedTarget = true;
- // refresh all sources _once_ before interacting with SuseRegister
- allCurrentSources = Pkg::SourceStartCache(true);
- foreach ( integer srcID, allCurrentSources, {
- y2milestone("Refreshing source with ID: %1", srcID);
- Pkg::SourceForceRefreshNow(srcID);
- });
+ if ( Pkg::SourceStartManager(true) )
+ {
+ y2milestone("Successfully started source manager.");
+ }
+ else
+ {
+ y2error("Failed to start source manager");
+ return 199;
+ }
+ y2milestone("Initially refreshing services.");
// refresh all services _once_ before interacting with SuseRegister
allCurrentServices = Pkg::ServiceAliases();
+
foreach ( string serviceAlias, allCurrentServices, {
y2milestone("Refreshing service with Alias: %1", serviceAlias);
Pkg::ServiceRefresh(serviceAlias);
});
+
+ y2milestone("Initially refreshing sources.");
+ // refresh all sources _once_ before interacting with SuseRegister
+ allCurrentSources = Pkg::SourceGetCurrent(true);
+
+ foreach ( integer srcID, allCurrentSources, {
+ y2milestone("Refreshing source with ID: %1", srcID);
+ Pkg::SourceForceRefreshNow(srcID);
+ });
+ y2milestone("Initial refreshing ended.");
}
// initialize SuseRegister
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.12/VERSION new/yast2-registration-2.17.13/VERSION
--- old/yast2-registration-2.17.12/VERSION 2008-11-11 16:36:53.000000000 +0100
+++ new/yast2-registration-2.17.13/VERSION 2008-11-14 18:06:02.000000000 +0100
@@ -1 +1 @@
-2.17.12
+2.17.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org