Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at Thu Oct 14 00:45:19 CEST 2010.
--------
--- yast2-packager/yast2-packager.changes 2010-10-05 12:47:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2010-10-12 16:25:21.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Oct 12 13:32:37 UTC 2010 - lslezak@suse.cz
+
+- don't use obsoleted inst_packages.ycp client, use PackagesUI.ycp
+ module instead (bnc#471490)
+- 2.20.3
+
+-------------------------------------------------------------------
+Tue Oct 12 09:39:59 UTC 2010 - lslezak@suse.cz
+
+- repo mgr: don't change URL when nothing has changed in the URL
+ dialog (bnc#529944)
+- 2.20.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.20.1.tar.bz2
New:
----
yast2-packager-2.20.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.i18Jfq/_old 2010-10-14 00:45:02.000000000 +0200
+++ /var/tmp/diff_new_pack.i18Jfq/_new 2010-10-14 00:45:02.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.20.1)
+# spec file for package yast2-packager (Version 2.20.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-packager
-Version: 2.20.1
+Version: 2.20.3
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.20.1.tar.bz2
+Source0: yast2-packager-2.20.3.tar.bz2
Prefix: /usr
@@ -100,7 +100,7 @@
(webpin) and installing them via OneClickInstall
%prep
-%setup -n yast2-packager-2.20.1
+%setup -n yast2-packager-2.20.3
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-packager-2.20.1.tar.bz2 -> yast2-packager-2.20.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.1/VERSION new/yast2-packager-2.20.3/VERSION
--- old/yast2-packager-2.20.1/VERSION 2010-09-30 22:18:59.000000000 +0200
+++ new/yast2-packager-2.20.3/VERSION 2010-10-12 15:33:58.000000000 +0200
@@ -1 +1 @@
-2.20.1
+2.20.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.1/configure new/yast2-packager-2.20.3/configure
--- old/yast2-packager-2.20.1/configure 2010-10-05 12:46:42.000000000 +0200
+++ new/yast2-packager-2.20.3/configure 2010-10-12 16:24:33.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for yast2-packager 2.20.1.
+# Generated by GNU Autoconf 2.67 for yast2-packager 2.20.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -551,8 +551,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.20.1'
-PACKAGE_STRING='yast2-packager 2.20.1'
+PACKAGE_VERSION='2.20.3'
+PACKAGE_STRING='yast2-packager 2.20.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1221,7 +1221,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.20.1 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.20.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1292,7 +1292,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.20.1:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.20.3:";;
esac
cat <<\_ACEOF
@@ -1372,7 +1372,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.20.1
+yast2-packager configure 2.20.3
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1389,7 +1389,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.20.1, which was
+It was created by yast2-packager $as_me 2.20.3, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2319,7 +2319,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.20.1'
+ VERSION='2.20.3'
cat >>confdefs.h <<_ACEOF
@@ -2441,7 +2441,7 @@
-VERSION="2.20.1"
+VERSION="2.20.3"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3359,7 +3359,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.20.1, which was
+This file was extended by yast2-packager $as_me 2.20.3, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3412,7 +3412,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-packager config.status 2.20.1
+yast2-packager config.status 2.20.3
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.1/configure.in new/yast2-packager-2.20.3/configure.in
--- old/yast2-packager-2.20.1/configure.in 2010-10-05 12:46:38.000000000 +0200
+++ new/yast2-packager-2.20.3/configure.in 2010-10-12 16:24:29.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-packager, 2.20.1, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.20.3, 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.20.1"
+VERSION="2.20.3"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.1/src/clients/inst_custom_packages.ycp new/yast2-packager-2.20.3/src/clients/inst_custom_packages.ycp
--- old/yast2-packager-2.20.1/src/clients/inst_custom_packages.ycp 2009-04-29 12:58:11.000000000 +0200
+++ new/yast2-packager-2.20.3/src/clients/inst_custom_packages.ycp 2010-10-12 16:23:58.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Client for 3rd prodcuts/addon products package installations
*
- * $Id: inst_custom_packages.ycp 57028 2009-04-29 10:58:09Z lslezak $
+ * $Id: inst_custom_packages.ycp 62608 2010-10-12 14:23:57Z lslezak $
*
*/
{
@@ -20,7 +20,7 @@
import "Installation";
import "GetInstArgs";
import "Mode";
-
+ import "PackagesUI";
list<string> packages = (list<string>)ProductFeatures::GetFeature("software", "packages");
@@ -57,9 +57,8 @@
y2error("Error solving package dependencies");
}
}
-
- symbol result = (symbol)WFM::CallFunction( "inst_packages", [`summaryMode]);
- y2milestone ("inst_packages returns %1", result);
+ symbol result = PackagesUI::RunPackageSelector($["mode" : `summaryMode]);
+ y2milestone ("Package selector returned: %1", result);
if (result == `accept)
result = `next;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.1/src/clients/sw_single.ycp new/yast2-packager-2.20.3/src/clients/sw_single.ycp
--- old/yast2-packager-2.20.1/src/clients/sw_single.ycp 2010-10-05 12:46:34.000000000 +0200
+++ new/yast2-packager-2.20.3/src/clients/sw_single.ycp 2010-10-12 16:23:58.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 62533 2010-10-05 10:46:33Z lslezak $
+ * $Id: sw_single.ycp 62608 2010-10-12 14:23:57Z lslezak $
*
* Note: sw_single accepts a map parameter: $[ "dialog_type" : symbol,
* "repo_mgmt" : boolean ]
@@ -509,7 +509,7 @@
y2milestone("Using packager widget options: %1", opts);
result = PackagesUI::RunPackageSelector(opts); // No: ask user via package selection widget
- y2milestone ("inst_packages returns %1", result);
+ y2milestone ("Package selector retured: %1", result);
if (result == `accept)
{
result = `next;
@@ -592,10 +592,10 @@
// confirm removal by user (bnc#399795)
if (action == `remove)
{
- map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ];
+ map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ];
y2milestone("Using packager widget options: %1", opts);
- result = (symbol)WFM::CallFunction( "inst_packages", [opts]);
+ result = PackagesUI::RunPackageSelector(opts);
if (result != `accept)
return `abort;
@@ -607,9 +607,13 @@
}
else
{
- result = (symbol)WFM::CallFunction( "inst_packages", [ $[ "dialog_type": `summaryMode, "repo_mgmt" : true] ]); // Ask user if conflicts
- y2milestone ("inst_packages returns %1", result);
- if (result == `accept)
+ // ask user if there is a problem
+ map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ];
+
+ result = PackagesUI::RunPackageSelector(opts);
+
+ y2milestone ("Packager returned: %1", result);
+ if (result == `accept)
result = `next;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.1/src/modules/SourceDialogs.ycp new/yast2-packager-2.20.3/src/modules/SourceDialogs.ycp
--- old/yast2-packager-2.20.1/src/modules/SourceDialogs.ycp 2010-01-07 12:52:18.000000000 +0100
+++ new/yast2-packager-2.20.3/src/modules/SourceDialogs.ycp 2010-10-12 11:50:45.000000000 +0200
@@ -1258,7 +1258,18 @@
void ServerStoreParts()
{
symbol type = (symbol) UI::QueryWidget( `id( `rb_type), `CurrentButton );
- map parsed = $[];
+
+ // initialize keys to empty values so the new and old values can be simply compared
+ map parsed = $[
+ "fragment":"",
+ "host":"",
+ "pass":"",
+ "path":"",
+ "port":"",
+ "query":"",
+ "scheme":"",
+ "user":""
+ ];
if ( type == `ftp )
parsed["scheme"] = "ftp";
else if ( type == `http )
@@ -1330,16 +1341,29 @@
parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value);
}
- // do not log the entered password
- y2milestone("Entered URL: %1", URL::HidePasswordToken(parsed));
- _url = URL::Build (parsed);
- y2milestone("URL::Build: %1", URL::HidePassword(_url));
-
- if (UI::WidgetExists (`id (`ch_iso)))
- {
- boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value);
- if (iso)
- _url = PosprocessISOURL (_url);
+ // keep the URL if user haven't changed anything (don't change escaped chars bnc#529944)
+ map parsed_old = URL::Parse(_url);
+ if (parsed == parsed_old)
+ {
+ y2milestone("No change, NOT updating the complete URL");
+ y2debug("Unchanged URL: %1", parsed);
+ }
+ else
+ {
+ y2milestone("A change detected, updating complete URL");
+ y2debug("Updating the URL: %1 -> %2", parsed_old, parsed);
+
+ // do not log the entered password
+ y2milestone("Entered URL: %1", URL::HidePasswordToken(parsed));
+ _url = URL::Build (parsed);
+ y2milestone("URL::Build: %1", URL::HidePassword(_url));
+
+ if (UI::WidgetExists (`id (`ch_iso)))
+ {
+ boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value);
+ if (iso)
+ _url = PosprocessISOURL (_url);
+ }
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org