Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Sep 25 01:08:16 CEST 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-09-18 10:30:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-09-23 17:21:06.000000000 +0200
@@ -1,0 +2,44 @@
+Tue Sep 23 17:10:36 CEST 2008 - locilka@suse.cz
+
+- New function Packages::GetBaseSourceID needed by update
+ (FATE #304488).
+- 2.17.19
+
+-------------------------------------------------------------------
+Mon Sep 22 18:24:24 CEST 2008 - lslezak@suse.cz
+
+- fixed a typo in the help text (bnc#428188)
+
+-------------------------------------------------------------------
+Mon Sep 22 16:38:30 CEST 2008 - locilka@suse.cz
+
+- Offering Community Repositories only if defined in control file
+ otherwise they are hidden (bnc #428370).
+- Returning back from Community Repositories if Canceled instead of
+ continuing the workflow (bnc #428377).
+- Reporting warning containing products selected for auto-removal
+ during update (FATE #304488).
+
+-------------------------------------------------------------------
+Fri Sep 19 12:28:59 CEST 2008 - locilka@suse.cz
+
+- Fixed handling of 'PATTERNS' in content file (bnc #418821).
+- Fixed checking which product can be replaced by which add-on
+ (FATE #301997, bnc #427002).
+- 2.17.18
+
+-------------------------------------------------------------------
+Thu Sep 18 14:44:25 CEST 2008 - lslezak@suse.cz
+
+- fixed "Installing Deleting <package>" message in the log view
+ disaplyed during package removal (bnc#427356)
+- use "repo_N" alias instead of full URL, make aliases more usable
+ in zypper (bnc#395363)
+
+-------------------------------------------------------------------
+Thu Sep 18 10:49:25 CEST 2008 - locilka@suse.cz
+
+- Handling new 'add_on_mode' key in product control file
+ (bnc #427002).
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.17.17.tar.bz2
New:
----
yast2-packager-2.17.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.k20668/_old 2008-09-25 01:08:02.000000000 +0200
+++ /var/tmp/diff_new_pack.k20668/_new 2008-09-25 01:08:02.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.17)
+# spec file for package yast2-packager (Version 2.17.19)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,18 +19,19 @@
Name: yast2-packager
-Version: 2.17.17
+Version: 2.17.19
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.17.tar.bz2
+Source0: yast2-packager-2.17.19.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
BuildRequires: yast2-transfer
-# Modules 'Slides' and 'SlideShow' moved to yast2
-BuildRequires: yast2 >= 2.17.19
+# ProductControl::SetAdditionalWorkflowParams
+# ProductControl::ResetAdditionalWorkflowParams
+BuildRequires: yast2 >= 2.17.27
# "order" flag for pattern resolvables
BuildRequires: yast2-pkg-bindings >= 2.16.31
# Newly added RPM
@@ -78,7 +79,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.17.17
+%setup -n yast2-packager-2.17.19
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +115,32 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Tue Sep 23 2008 locilka@suse.cz
+- New function Packages::GetBaseSourceID needed by update
+ (FATE #304488).
+- 2.17.19
+* Mon Sep 22 2008 lslezak@suse.cz
+- fixed a typo in the help text (bnc#428188)
+* Mon Sep 22 2008 locilka@suse.cz
+- Offering Community Repositories only if defined in control file
+ otherwise they are hidden (bnc #428370).
+- Returning back from Community Repositories if Canceled instead of
+ continuing the workflow (bnc #428377).
+- Reporting warning containing products selected for auto-removal
+ during update (FATE #304488).
+* Fri Sep 19 2008 locilka@suse.cz
+- Fixed handling of 'PATTERNS' in content file (bnc #418821).
+- Fixed checking which product can be replaced by which add-on
+ (FATE #301997, bnc #427002).
+- 2.17.18
+* Thu Sep 18 2008 lslezak@suse.cz
+- fixed "Installing Deleting <package>" message in the log view
+ disaplyed during package removal (bnc#427356)
+- use "repo_N" alias instead of full URL, make aliases more usable
+ in zypper (bnc#395363)
+* Thu Sep 18 2008 locilka@suse.cz
+- Handling new 'add_on_mode' key in product control file
+ (bnc #427002).
* Thu Sep 18 2008 locilka@suse.cz
- Always initialize supported desktops from control file
(bnc #427061).
++++++ yast2-packager-2.17.17.tar.bz2 -> yast2-packager-2.17.19.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.17/configure new/yast2-packager-2.17.19/configure
--- old/yast2-packager-2.17.17/configure 2008-09-18 10:24:36.000000000 +0200
+++ new/yast2-packager-2.17.19/configure 2008-09-23 17:27:42.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.17.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.19.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.17.17'
-PACKAGE_STRING='yast2-packager 2.17.17'
+PACKAGE_VERSION='2.17.19'
+PACKAGE_STRING='yast2-packager 2.17.19'
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-packager 2.17.17 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.17.19 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-packager 2.17.17:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.17.19:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.17.17
+yast2-packager configure 2.17.19
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-packager $as_me 2.17.17, which was
+It was created by yast2-packager $as_me 2.17.19, 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-packager'
- VERSION='2.17.17'
+ VERSION='2.17.19'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.17"
+VERSION="2.17.19"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -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-packager $as_me 2.17.17, which was
+This file was extended by yast2-packager $as_me 2.17.19, 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-packager config.status 2.17.17
+yast2-packager config.status 2.17.19
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-packager-2.17.17/configure.in new/yast2-packager-2.17.19/configure.in
--- old/yast2-packager-2.17.17/configure.in 2008-09-18 10:24:32.000000000 +0200
+++ new/yast2-packager-2.17.19/configure.in 2008-09-23 17:27:38.000000000 +0200
@@ -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.17, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.19, 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.17"
+VERSION="2.17.19"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.17/src/clients/inst_productsources.ycp new/yast2-packager-2.17.19/src/clients/inst_productsources.ycp
--- old/yast2-packager-2.17.17/src/clients/inst_productsources.ycp 2008-09-10 11:54:38.000000000 +0200
+++ new/yast2-packager-2.17.19/src/clients/inst_productsources.ycp 2008-09-22 16:48:35.000000000 +0200
@@ -70,7 +70,6 @@
import "CommandLine";
import "PackageCallbacks";
import "SourceManager";
- import "ProductControl";
import "FileUtils";
import "HTTP";
@@ -1238,7 +1237,7 @@
"prod_dir" : pth,
// alias needs to be unique
// bugzilla #309317
- "alias" : GetUniqueAlias (url),
+ "alias" : GetUniqueAlias("repo"),
"type" : repo_type,
]);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.17/src/clients/repositories.ycp new/yast2-packager-2.17.19/src/clients/repositories.ycp
--- old/yast2-packager-2.17.17/src/clients/repositories.ycp 2008-09-11 12:48:55.000000000 +0200
+++ new/yast2-packager-2.17.19/src/clients/repositories.ycp 2008-09-22 13:11:25.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 51008 2008-09-11 06:49:04Z lslezak $
+ * $Id: repositories.ycp 51333 2008-09-19 13:54:47Z lslezak $
*
*/
@@ -288,7 +288,12 @@
UI::ChangeWidget (`id (`enable), `Value, info["enabled"]:true);
UI::ChangeWidget (`id (`autorefresh), `Value, info["autorefresh"]:true);
- UI::ChangeWidget (`id (`priority), `Value, info["priority"]:default_priority);
+
+ if (repo_mode)
+ {
+ // priority is displayed only for repositories
+ UI::ChangeWidget (`id (`priority), `Value, info["priority"]:default_priority);
+ }
}
void fillCurrentRepoInfo () {
@@ -340,6 +345,12 @@
sourceStatesOut = remove( sourceStatesOut, index );
}
+ define void deleteService(integer index)
+ {
+ y2milestone("Removing service: %1", index);
+ serviceStatesOut = remove(serviceStatesOut, index);
+ }
+
boolean Write() {
y2milestone("New config: %1", sourceStatesOut);
boolean success = Pkg::SourceEditSet( sourceStatesOut );
@@ -839,13 +850,29 @@
}
else if ( input == `delete )
{
- // yes-no popup
- if ( Popup::YesNo( _("Delete the selected repository from the list?") ) )
- {
- deleteSource( current );
- fillTable(repository_view, displayed_service);
- fillCurrentRepoInfo();
- }
+ if (repository_view)
+ {
+ // yes-no popup
+ if ( Popup::YesNo( _("Delete the selected repository from the list?") ) )
+ {
+ deleteSource( current );
+ fillTable(repository_view, displayed_service);
+ fillCurrentRepoInfo();
+ }
+ }
+ else
+ {
+ // yes-no popup
+ if ( Popup::YesNo( _("Delete the selected service from the list?") ) )
+ {
+ deleteService( current );
+ fillTable(repository_view, displayed_service);
+ fillCurrentRepoInfo();
+
+ // refresh also the tree widget
+ UI::ChangeWidget(`id(`tree), `Items, buildTree());
+ }
+ }
}
else if (input == `enable)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.17/src/include/key_manager_dialogs.ycp new/yast2-packager-2.17.19/src/include/key_manager_dialogs.ycp
--- old/yast2-packager-2.17.17/src/include/key_manager_dialogs.ycp 2008-04-01 10:34:46.000000000 +0200
+++ new/yast2-packager-2.17.19/src/include/key_manager_dialogs.ycp 2008-09-24 13:25:41.000000000 +0200
@@ -20,6 +20,8 @@
import "String";
import "FileUtils";
import "Directory";
+import "Report";
+import "Sequencer";
boolean gpg_mgr_standalone_mode = false;
@@ -127,7 +129,7 @@
`MarginBox(1, 0.3,
`VBox(
`HBox(
- `TextEntry(`id(`file), `opt(`notify), Label::FileName()),
+ `InputField(`id(`file), `opt(`notify, `hstretch), Label::FileName()),
`VBox(
`Label(""),
`PushButton(`id(`browse), Label::BrowseButton())
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.17/src/include/repositories_include.ycp new/yast2-packager-2.17.19/src/include/repositories_include.ycp
--- old/yast2-packager-2.17.17/src/include/repositories_include.ycp 2008-09-17 16:16:25.000000000 +0200
+++ new/yast2-packager-2.17.19/src/include/repositories_include.ycp 2008-09-22 16:57:57.000000000 +0200
@@ -306,7 +306,12 @@
any commrepos = WFM::call ("inst_productsources", [$["skip_already_used_repos":true]]);
y2milestone ("Community Repositories returned: %1", commrepos);
- return `next;
+ if (commrepos == `abort || commrepos == `cancel) {
+ y2milestone ("Using CR have been canceled");
+ return `back;
+ } else {
+ return `next;
+ }
}
if (createSource(url, plaindir, download_meta, name) == `again)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.17/src/modules/AddOnProduct.ycp new/yast2-packager-2.17.19/src/modules/AddOnProduct.ycp
--- old/yast2-packager-2.17.17/src/modules/AddOnProduct.ycp 2008-09-08 13:30:58.000000000 +0200
+++ new/yast2-packager-2.17.19/src/modules/AddOnProduct.ycp 2008-09-19 13:24:00.000000000 +0200
@@ -38,6 +38,7 @@
import "WorkflowManager";
import "URL";
import "Mode";
+import "Stage";
import "Icon";
import "PackageCallbacks";
@@ -129,7 +130,7 @@
/**
* Returns whether add-on product got as parameter (source id)
* replaces some already installed add-on or whether it is a new
- * installation.
+ * installation. Repositories and target have to be initialized.
*
* @param integer source_id
* @param string "installation" or "update" according the current state
@@ -137,17 +138,61 @@
global string AddOnMode (integer source_id) {
list