Hello community,
here is the log from the commit of package yast2-wagon for openSUSE:Factory
checked in at Tue Aug 2 09:03:16 CEST 2011.
--------
--- yast2-wagon/yast2-wagon.changes 2011-07-18 15:26:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-wagon/yast2-wagon.changes
2011-08-01 14:06:42.000000000 +0200
@@ -1,0 +2,23 @@
+Mon Aug 1 11:40:57 UTC 2011 - lsle...@suse.cz
+
+- 2.21.4
+
+-------------------------------------------------------------------
+Fri Jul 29 07:12:14 UTC 2011 - lsle...@suse.cz
+
+- display solver error in the migration propsal, do not allow
+ starting migration when there is an unsolved problem (bnc#708676)
+- do not disable current repositories, minimal migration uses
+ "DUP from" feature so they can stay enabled (bnc#708632)
+
+-------------------------------------------------------------------
+Thu Jul 28 11:56:48 UTC 2011 - lsle...@suse.cz
+
+- fixed registration status check when registering against SMT
+ (bnc#708888)
+- properly display selected migration type when going back in
+ the migration workflow (bnc#708667)
+- reset and repropose package selection when migration type is
+ changed (bnc#708641)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-wagon-2.21.3.tar.bz2
New:
----
yast2-wagon-2.21.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-wagon.spec ++++++
--- /var/tmp/diff_new_pack.mIniIZ/_old 2011-08-02 09:01:04.000000000 +0200
+++ /var/tmp/diff_new_pack.mIniIZ/_new 2011-08-02 09:01:04.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-wagon
-Version: 2.21.3
+Version: 2.21.4
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-wagon-2.21.3.tar.bz2
+Source0: yast2-wagon-2.21.4.tar.bz2
Prefix: /usr
@@ -74,7 +74,7 @@
through command line tools.
%prep
-%setup -n yast2-wagon-2.21.3
+%setup -n yast2-wagon-2.21.4
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-wagon-2.21.3.tar.bz2 -> yast2-wagon-2.21.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-wagon-2.21.3/VERSION
new/yast2-wagon-2.21.4/VERSION
--- old/yast2-wagon-2.21.3/VERSION 2011-07-18 15:04:17.000000000 +0200
+++ new/yast2-wagon-2.21.4/VERSION 2011-08-01 14:04:36.000000000 +0200
@@ -1 +1 @@
-2.21.3
+2.21.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-wagon-2.21.3/configure
new/yast2-wagon-2.21.4/configure
--- old/yast2-wagon-2.21.3/configure 2011-07-18 15:25:47.000000000 +0200
+++ new/yast2-wagon-2.21.4/configure 2011-08-01 14:06:10.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-wagon 2.21.3.
+# Generated by GNU Autoconf 2.68 for yast2-wagon 2.21.4.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-wagon'
PACKAGE_TARNAME='yast2-wagon'
-PACKAGE_VERSION='2.21.3'
-PACKAGE_STRING='yast2-wagon 2.21.3'
+PACKAGE_VERSION='2.21.4'
+PACKAGE_STRING='yast2-wagon 2.21.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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-wagon 2.21.3 to adapt to many kinds of systems.
+\`configure' configures yast2-wagon 2.21.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1300,7 +1300,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-wagon 2.21.3:";;
+ short | recursive ) echo "Configuration of yast2-wagon 2.21.4:";;
esac
cat <<\_ACEOF
@@ -1380,7 +1380,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-wagon configure 2.21.3
+yast2-wagon configure 2.21.4
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1397,7 +1397,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-wagon $as_me 2.21.3, which was
+It was created by yast2-wagon $as_me 2.21.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2327,7 +2327,7 @@
# Define the identity of the package.
PACKAGE='yast2-wagon'
- VERSION='2.21.3'
+ VERSION='2.21.4'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.21.3"
+VERSION="2.21.4"
RPMNAME="yast2-wagon"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
@@ -3386,7 +3386,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-wagon $as_me 2.21.3, which was
+This file was extended by yast2-wagon $as_me 2.21.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3439,7 +3439,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-wagon config.status 2.21.3
+yast2-wagon config.status 2.21.4
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-wagon-2.21.3/configure.in
new/yast2-wagon-2.21.4/configure.in
--- old/yast2-wagon-2.21.3/configure.in 2011-07-18 15:25:45.000000000 +0200
+++ new/yast2-wagon-2.21.4/configure.in 2011-08-01 14:06:08.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-wagon, 2.21.3, http://bugs.opensuse.org/, yast2-wagon)
+AC_INIT(yast2-wagon, 2.21.4, http://bugs.opensuse.org/, yast2-wagon)
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.21.3"
+VERSION="2.21.4"
RPMNAME="yast2-wagon"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-wagon-2.21.3/src/clients/wagon_dup_repositories.ycp
new/yast2-wagon-2.21.4/src/clients/wagon_dup_repositories.ycp
--- old/yast2-wagon-2.21.3/src/clients/wagon_dup_repositories.ycp
2011-07-18 14:37:07.000000000 +0200
+++ new/yast2-wagon-2.21.4/src/clients/wagon_dup_repositories.ycp
2011-08-01 14:04:03.000000000 +0200
@@ -22,6 +22,7 @@
import "Wizard";
import "Popup";
+ include "wagon/common_func.ycp";
define list TableContent()
{
@@ -154,6 +155,8 @@
{
// heading text
string heading_text = _("Migration Type");
+ // full migration?
+ boolean full = sort(Wagon::DupRepos()) ==
sort(Pkg::SourceGetCurrent(true));
term contents = `VBox(
// frame label
@@ -163,9 +166,9 @@
`RadioButtonGroup(`id(`migration_type),
`VBox(
// radio button
- `Left(`RadioButton(`id(`minimal), _("&Minimal
migration (only the core packages)"), true)),
+ `Left(`RadioButton(`id(`minimal), _("&Minimal -
upgrade from repositories added by registration"), !full)),
// radio button
- `Left(`RadioButton(`id(`full), _("&Full
migration (all packages)")))
+ `Left(`RadioButton(`id(`full), _("&Full -
upgrade from all repositories"), full))
)
)
)
@@ -181,7 +184,9 @@
// help text
string help_text = "<p>" + _("Select the requested migration type.")
// help text
- + "</p><p>" + _("Minimal migration migrates only minimal set of
packages (the core packages providing basic system functionality), full
migration migrates all installed packages.") + "</p>";
+ + "</p><p>" + _("Minimal migration only uses the repositories added
by registration, full migration migrates all packages to the latest version
available in any enabled repository. Full migration might use third party
repositories.")
+ // help text
+ + "</p><p>" + _("Press <b>Advanced</b> button to manually select
the repositories used for upgrading.") + "</p>";
Wizard::SetContents (heading_text, contents, help_text,
GetInstArgs::enable_back(), GetInstArgs::enable_next());
@@ -193,8 +198,12 @@
symbol ret = nil;
+ list<integer> prev_dup_repos = Wagon::DupRepos();
+ boolean prev_manual_selection = Wagon::ManualRepoSelection();
+
while (true) {
- ret = (symbol)UI::UserInput();
+ // go to advanced config it was used previously
+ ret = (Wagon::ManualRepoSelection()) ? `advanced :
(symbol)UI::UserInput();
if (ret == `next)
{
@@ -207,6 +216,7 @@
// DUP: all repositories
y2milestone("Selected full migration, using %1
repositories", size(Pkg::SourceGetCurrent(true)));
Wagon::SetDupRepos(Pkg::SourceGetCurrent(true));
+ Wagon::SetManualRepoSelection(false);
}
else if (mtype == `minimal)
{
@@ -229,6 +239,7 @@
y2milestone("Converted aliases to ids: %1", added_repos);
Wagon::SetDupRepos(added_repos);
+ Wagon::SetManualRepoSelection(false);
}
else
{
@@ -255,14 +266,20 @@
y2milestone("Manual DUP repository selection selected");
ret = DupSelectionDialog();
- if (ret == `abort || ret == `close || ret == `next)
+ if (ret == `abort || ret == `close)
+ {
+ break;
+ }
+ else if (ret == `next)
{
+ Wagon::SetManualRepoSelection(true);
break;
}
else if (ret == `back)
{
// refresh the dialog
SetMigrationSelectionDialogContent();
+ Wagon::SetManualRepoSelection(false);
}
else
{
@@ -275,6 +292,15 @@
}
}
+ if (ret == `next && (prev_dup_repos != Wagon::DupRepos() ||
prev_manual_selection != Wagon::ManualRepoSelection()))
+ {
+ y2milestone("DUP repository config has been changed, repropose
package selection");
+ Wagon::ResetDUPProposal();
+
+ // reset current package selection
+ ResetPackager();
+ }
+
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-wagon-2.21.3/src/clients/wagon_migration_products.ycp
new/yast2-wagon-2.21.4/src/clients/wagon_migration_products.ycp
--- old/yast2-wagon-2.21.3/src/clients/wagon_migration_products.ycp
2010-03-24 08:23:28.000000000 +0100
+++ new/yast2-wagon-2.21.4/src/clients/wagon_migration_products.ycp
2011-08-01 14:04:03.000000000 +0200
@@ -290,9 +290,6 @@
ResetPackager();
- // Remembers all repositories that will be disabled later (after
registration run)
- FindOldRepositoriesToBeDisabled();
-
y2milestone ("Returning: %1", ret);
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-wagon-2.21.3/src/clients/wagon_registration_check.ycp
new/yast2-wagon-2.21.4/src/clients/wagon_registration_check.ycp
--- old/yast2-wagon-2.21.3/src/clients/wagon_registration_check.ycp
2011-06-30 10:52:38.000000000 +0200
+++ new/yast2-wagon-2.21.4/src/clients/wagon_registration_check.ycp
2011-08-01 14:04:03.000000000 +0200
@@ -232,6 +232,14 @@
// some other problem and user has to be informed about it
define boolean Interactive(map<string,any> status)
{
+ // SMT doesn't write /var/lib/suseRegister/registration-status.xml file
+ // so we cannot get any registration details, assume the system is
fully registered
+ if (status["ncc"]:nil == false)
+ {
+ y2milestone("SMT server is used, assuming fully registered system");
+ return false;
+ }
+
// the system is not registered at all
if (status["registered_system"]:false)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-wagon-2.21.3/src/include/common_func.ycp
new/yast2-wagon-2.21.4/src/include/common_func.ycp
--- old/yast2-wagon-2.21.3/src/include/common_func.ycp 2011-06-30
10:50:59.000000000 +0200
+++ new/yast2-wagon-2.21.4/src/include/common_func.ycp 2011-08-01
14:04:03.000000000 +0200
@@ -126,24 +126,23 @@
);
y2milestone ("Resetting Pkg");
- Pkg::PkgApplReset();
- Pkg::PkgReset();
- symbol status = nil;
- string name = nil;
+ list<integer> repos = Pkg::GetUpgradeRepos();
+ if (size(repos) > 0)
+ {
+ y2milestone("Resetting upgrade repos config");
+ foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);});
+ }
- y2milestone ("Neutralizing all resolvables");
- foreach (symbol resolvable, [`pattern, `patch, `package, `product,
`srcpackage], {
- Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */);
- });
-
- y2milestone ("Running solver");
- Pkg::PkgSolve (true);
+ // reset solver flags
+ Pkg::SetSolverFlags($["reset" : true]);
Pkg::TargetFinish();
Pkg::SourceFinishAll();
Wagon::InitPkg();
+
+ y2milestone ("Running solver");
Pkg::PkgSolve (true);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-wagon-2.21.3/src/modules/Wagon.ycp
new/yast2-wagon-2.21.4/src/modules/Wagon.ycp
--- old/yast2-wagon-2.21.3/src/modules/Wagon.ycp 2011-07-18
15:25:43.000000000 +0200
+++ new/yast2-wagon-2.21.4/src/modules/Wagon.ycp 2011-08-01
14:06:03.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Lukas Ocilka <loci...@suse.cz>
* Internal
*
- * $Id: Wagon.ycp 64872 2011-07-18 13:25:42Z lslezak $
+ * $Id: Wagon.ycp 65108 2011-08-01 12:06:02Z lslezak $
*
* Module for handling WAGON.
*
@@ -123,6 +123,20 @@
dup_repos = repos;
}
+ boolean manual_repo_selection = false;
+
+ // manual or automatic DUP repo selection?
+ global boolean ManualRepoSelection()
+ {
+ return manual_repo_selection;
+ }
+
+ global void SetManualRepoSelection(boolean manual)
+ {
+ y2milestone("Manual DUP repo selection: %1", manual);
+ manual_repo_selection = manual;
+ }
+
// list of repositories (aliases) added by suse_register
list<string> new_registration_repos = [];
@@ -437,7 +451,8 @@
Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]);
}
- Pkg::PkgSolve(true);
+ // set the solve error flag for packages proposal
+ Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors();
already_proposed = true;
@@ -761,6 +776,50 @@
return true;
}
+ /**
+ * Check whether NCC or SMT is used for registration
+ */
+ define boolean NCCUsed()
+ {
+ // check /etc/suseRegister.conf content
+ string conf = (string)SCR::Read(.target.string,
"/etc/suseRegister.conf");
+
+ if (conf == nil)
+ {
+ y2error("Cannot read /etc/suseRegister.conf");
+ return nil;
+ }
+
+ list<string> lines = splitstring(conf, "\n");
+
+ boolean found_url = false;
+ boolean found_ncc = false;
+
+ foreach(string line, lines, {
+ if (regexpmatch(line, "^[ \t]*url[ \t]*=[ \t]*"))
+ {
+ found_url = true;
+ y2milestone("Found registration URL option: %1", line);
+
+ if (regexpmatch(line, "^[ \t]*url[ \t]*=[
\t]*https://secure-www.novell.com/center/regsvc/*[ \t]*(#*.*)*"))
+ {
+ found_ncc = true;
+ y2milestone("NCC URL found");
+ }
+ }
+ });
+
+ if (!found_url)
+ {
+ y2error("No url option found in /etc/suseRegister.conf");
+ return nil;
+ }
+
+ y2milestone("Found NCC registration server: %1", found_ncc);
+
+ return found_ncc;
+ }
+
/*
* Read registration status and sort products according their status
* @param file Read this registration status file
@@ -873,6 +932,7 @@
* @return map<string,any> result: $[
*
"registered_system" : (boolean) - true registration was run, false
registration has never run or there is no product to register (e.g. openSUSE
installation) or the registration completely failed
+ "ncc" : (boolean) - true - NCC is used for
registration, false - a SMT server is configured, nil - not configured or other
error
"timestamp" : (integer) - time when the status was saved
(unix time), -1 in an unregistered system
"registered" : (list<string>) - registered products
"provisional" : (list<string>) - products with provisional
subscription (registered, but no updates available)
@@ -884,7 +944,10 @@
*/
global define map<string,any> RegistrationStatus()
{
- return RegistrationStatusFromFile(RegistrationStatus::RegFile());
+ map<string,any> ret =
RegistrationStatusFromFile(RegistrationStatus::RegFile());
+ ret["ncc"] = NCCUsed();
+
+ return ret;
}
/* EOF */
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
