Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Jan 26 11:22:47 CET 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-01-25 17:01:19.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-01-26 10:42:12.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Jan 26 07:10:05 CET 2007 - lslezak@suse.cz
+
+- removed obsolete module PackageSelectionIO.ycp (reading/writing
+ of the current package selection is implemented in UI)
+- removed Packages::languagePackages() - yast2-trans-* packages are
+ selected by the solver
+- use new Pkg::*Locale functions, do not install language packages
+ when yast2 -i is invoked in another locale (#223624)
+- 2.15.5
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.4.tar.bz2
New:
----
yast2-packager-2.15.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.yy6620/_old 2007-01-26 11:22:03.000000000 +0100
+++ /var/tmp/diff_new_pack.yy6620/_new 2007-01-26 11:22:03.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.4)
+# spec file for package yast2-packager (Version 2.15.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,17 @@
# norootforbuild
Name: yast2-packager
-Version: 2.15.4
+Version: 2.15.5
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.4.tar.bz2
+Source0: yast2-packager-2.15.5.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
Requires: yast2-country
-# Pkg::TargetStoreRemove(), bug #210552; Pkg::SourceCreateType(), bug #168358
-Requires: yast2-pkg-bindings >= 2.14.0
+# new Pkg::*Locale() functions (#223624)
+Requires: yast2-pkg-bindings >= 2.15.4
# Label::SkipButton()
Requires: yast2 >= 2.15.2
Requires: yast2-storage
@@ -46,7 +46,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.4
+%setup -n yast2-packager-2.15.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,14 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Fri Jan 26 2007 - lslezak@suse.cz
+- removed obsolete module PackageSelectionIO.ycp (reading/writing
+ of the current package selection is implemented in UI)
+- removed Packages::languagePackages() - yast2-trans-* packages are
+ selected by the solver
+- use new Pkg::*Locale functions, do not install language packages
+ when yast2 -i is invoked in another locale (#223624)
+- 2.15.5
* Thu Jan 25 2007 - lslezak@suse.cz
- improved the disk space check - compute disk usage of a packge
for the current partitioning (#222556), ignore read-only
++++++ yast2-packager-2.15.4.tar.bz2 -> yast2-packager-2.15.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.4/configure new/yast2-packager-2.15.5/configure
--- old/yast2-packager-2.15.4/configure 2007-01-25 16:57:45.000000000 +0100
+++ new/yast2-packager-2.15.5/configure 2007-01-26 10:36:20.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.4.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.15.4'
-PACKAGE_STRING='yast2-packager 2.15.4'
+PACKAGE_VERSION='2.15.5'
+PACKAGE_STRING='yast2-packager 2.15.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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.15.4 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.15.4:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.5:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.15.4
+yast2-packager configure 2.15.5
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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.15.4, which was
+It was created by yast2-packager $as_me 2.15.5, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.15.4'
+ VERSION='2.15.5'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.4"
+VERSION="2.15.5"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3260,7 +3260,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.15.4, which was
+This file was extended by yast2-packager $as_me 2.15.5, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3303,7 +3303,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.15.4
+yast2-packager config.status 2.15.5
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.4/configure.in new/yast2-packager-2.15.5/configure.in
--- old/yast2-packager-2.15.4/configure.in 2007-01-25 16:57:39.000000000 +0100
+++ new/yast2-packager-2.15.5/configure.in 2007-01-26 10:36:15.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.4, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.5, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.4"
+VERSION="2.15.5"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.4/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.15.5/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.15.4/src/clients/inst_rpmcopy.ycp 2006-11-13 14:27:38.000000000 +0100
+++ new/yast2-packager-2.15.5/src/clients/inst_rpmcopy.ycp 2007-01-26 10:36:11.000000000 +0100
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 34305 2006-11-13 12:17:34Z locilka $
+ * $Id: inst_rpmcopy.ycp 35648 2007-01-26 09:36:08Z lslezak $
*/
{
@@ -796,7 +796,7 @@
// bugzilla #208222
ReleaseHDDUsedAsInstallationSource();
- Pkg::SetLocale (Language::language);
+ Pkg::SetTextLocale (Language::language);
SlideShow::SetLanguage (Language::language);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.4/src/clients/software_proposal.ycp new/yast2-packager-2.15.5/src/clients/software_proposal.ycp
--- old/yast2-packager-2.15.4/src/clients/software_proposal.ycp 2006-10-13 11:05:27.000000000 +0200
+++ new/yast2-packager-2.15.5/src/clients/software_proposal.ycp 2007-01-26 07:26:40.000000000 +0100
@@ -37,10 +37,10 @@
// save information about target change time in module Packages
Packages::timestamp = Storage::GetTargetChangeTime();
- if (Pkg::GetLocale () != Language::language)
+ if (Pkg::GetPackageLocale () != Language::language)
{
language_changed = true;
- Pkg::SetLocale (Language::language);
+ Pkg::SetPackageLocale (Language::language);
}
if (! contains (Pkg::GetAdditionalLocales (), Language::language))
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.4/src/clients/sw_single.ycp new/yast2-packager-2.15.5/src/clients/sw_single.ycp
--- old/yast2-packager-2.15.4/src/clients/sw_single.ycp 2007-01-08 14:25:30.000000000 +0100
+++ new/yast2-packager-2.15.5/src/clients/sw_single.ycp 2007-01-26 10:36:11.000000000 +0100
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 34619 2006-11-29 07:41:37Z lslezak $
+ * $Id: sw_single.ycp 35648 2007-01-26 09:36:08Z lslezak $
*/
{
@@ -283,7 +283,7 @@
// check the arguments and try the mount/search for local description
symbol result = CheckWhichPackages (arg_list);
- Pkg::SetLocale (UI::GetLanguage (true));
+ Pkg::SetTextLocale (UI::GetLanguage (true));
y2milestone ("SW_SINGLE: result CheckWhichPackages %1", result);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.4/src/modules/PackageSelectionIO.ycp new/yast2-packager-2.15.5/src/modules/PackageSelectionIO.ycp
--- old/yast2-packager-2.15.4/src/modules/PackageSelectionIO.ycp 2005-02-24 14:19:52.000000000 +0100
+++ new/yast2-packager-2.15.5/src/modules/PackageSelectionIO.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,307 +0,0 @@
-/**
- * Module: PackageSelectionIO.ycp
- *
- * Authors: Stefan Schubert (schubi@suse.de)
- *
- * Purpose: Saving and loading user package selections
- *
- * $Id: PackageSelectionIO.ycp 21866 2005-02-23 13:50:15Z jsrain $
- */
-
-{
-
- module "PackageSelectionIO";
-
- textdomain "packager";
-
- import "Installation";
- import "Label";
- import "Stage";
- import "Popup";
- import "Report";
- import "StorageDevices";
-
- string lastHarddiskPath = "/var/lib/YaST2/packages.usr";
- string lastFloppyPath = "packages.usr";
- boolean floppySelected = false;
- boolean savedLaterSelected = false;
-
- //
- // Saving package selections
- //
- global define boolean savePackageSelection( boolean saveLater ) ``{
- boolean success = true;
- if ( floppySelected && saveLater)
- {
- string floppy_path = "/media/floppy/";
- WFM::Execute (.local.umount, floppy_path); // Just for safety
-
- // Yes/No MsgBox; default: Yes
- // Ask for a formatted floppy to save the package selection
- while (Popup::YesNo(_("The current package selection will be saved
-on a floppy disk. Insert a formatted floppy.
-
-Write data to the floppy disk now?
-")))
- {
-
- // mount floppy_path by WFM, so use Execute() and Write()
-
- if ( WFM::Execute (.local.mount, [StorageDevices::FloppyDevice, floppy_path]) == true)
- {
- success = SCR::Write (.package.packageSelections, floppy_path+lastFloppyPath );
-
- WFM::Execute (.local.umount, floppy_path);
-
- if (success)
- {
- // msgbox
- // data saved to floppy disk
- Report::Message(_("Your settings have been saved to the floppy disk."));
- break;
- }
- else
- {
- // text of a error popup: error occured while saving settings to the floppy
- Report::Error(_("Error while saving settings to the floppy disk.
-Verify that the floppy is formatted
-and is not write protected.
-"));
- }
- }
- else
- {
- // Popup with a 'Retry', a 'Cancel' button and a 'Format floppy' button.
- // Check inserted floppy.
- // headline
- any ret = Popup::AnyQuestion3(_("Could not find a formatted floppy disk."),
-// popup contents
- _("Are you sure you inserted a floppy disk
-into the correct drive?
-If so, is the disk formatted and verified?
-"), Label::RetryButton(), Label::CancelButton(),
-// push button
-_("&Format floppy"), `focus_yes);
-
- if (ret == `no) // cancel
- {
- break;
- }
- else if (ret == `retry) // format floppy
- {
- UI::OpenDialog( `opt( `decorated ),
- `HBox(`HSpacing(1), `Label(Label::PleaseWaitMsg()), `HSpacing(1)));
- SCR::Execute (.target.bash, "/sbin/mkdosfs " + StorageDevices::FloppyDevice);
- UI::CloseDialog();
- }
- // default: retry loop
- }
- }
- }
- else if ( !floppySelected )
- {
- // Harddisk
- if ( !Stage::initial () ||
- ( !saveLater
- && savedLaterSelected ))
- {
- // harddisk is present
- success = SCR::Write (.package.packageSelections,
- Installation::destdir + lastHarddiskPath );
- if ( success )
- {
- // text of a message popup: package selection is written correctly
- Report::Message(_("Your package selections have been written to the hard disk."));
- }
- else
- {
- // text of en error popup: error while writing data
- Report::Message(_("Error while saving package selections to the hard disk."));
- }
- }
- else
- {
- savedLaterSelected = true;
- }
- }
- return success;
- };
-
- //
- // Loading package selections
- //
- global define boolean loadPackageSelection( ) ``{
- boolean success = true;
- // text of a popup with 'Yes' and 'No' button
- if ( Popup::YesNo(_("Do you really want to reset your settings?")))
- {
- if ( floppySelected )
- {
- string floppy_path = "/media/floppy/";
- WFM::Execute (.local.umount, floppy_path); // Just for safety
-
- // Yes/No MsgBox; default: Yes
- // Ask for the floppy with the package selection.
- while (Popup::YesNo(_("The current package selection will be loaded
-from a floppy disk. Insert the floppy.
-
-Read data from the floppy disk now?
-")))
- {
- // mount floppy_path by WFM, so use Execute() and Read()
-
- if ( WFM::Execute (.local.mount, [StorageDevices::FloppyDevice, floppy_path]) == true)
- {
- success = (boolean) SCR::Read (.package.packageSelections, floppy_path+lastFloppyPath );
-
- WFM::Execute (.local.umount, floppy_path);
-
- if (success)
- {
- break;
- }
- else
- {
- // text of an error popup: can't read settings from floppy
- Report::Error(_("Error while loading settings from the floppy disk.
-Verify that the correct floppy has been inserted
-and that the path name has been written correctly.
-"));
- }
- }
- }
- }
- else
- {
- // Harddisk
- success = (boolean) SCR::Read (.package.packageSelections,
- Installation::destdir + lastHarddiskPath );
- if ( !success )
- {
- // text of an error poup: can't read settings from hard disk
- Report::Error(_("Error while loading settings from the hard disk.
-Verify that the path name has been written correctly.
-"));
- }
- }
- }
- else
- {
- success = false;
- }
-
- return success;
- };
-
- //
- // Saving and Loading package user selections
- //
- global define void SaveLoadSelection( ) ``{
-
- savedLaterSelected = false;
-
- term dia_opt = `opt ( `decorated );
-
- UI::OpenDialog( dia_opt,
- `HBox( `VSpacing(10),
- `VBox (`HSpacing(50),
- // Headline of a popup with a 'Cancel', a 'Load' and a 'Save' button.
- // A user defined selection of packages can be loaded or saved.
- `Left(`Heading( _("Load or save package selection") )),
- `VSpacing(0.2),
- `RadioButtonGroup(`id(`selections),`opt(`notify),
- `VBox(
- `HBox(
- `Left(`RadioButton(`id(`harddisk),
- `opt(`notify),
- // Radio button for saving/loading from harddisk
- _("&Harddisk"),
- !floppySelected)),
- `Left(`RadioButton(`id(`floppy),
- `opt(`notify),
- // Radio button for saving/loading from floppy
- _("&Floppy"),
- floppySelected))
- ),
- `VSpacing(0.8),
- `TextEntry(`id(`path),
- // Input field label for the filename
- _("&Path name"),
- ( floppySelected? lastFloppyPath:lastHarddiskPath ))
- )
- ),
- `VSpacing(0.2),
- `HBox(
- // button labels selection popup
- `Left(`PushButton( `id(`cancel),`opt(`default), Label::CancelButton())),
- // push button
- `Right(`PushButton( `id(`load), _("&Load"))),
- // push button
- `Right(`PushButton( `id(`save), _("&Save")))
- )
- )
- )
- );
-
- while ( true )
- {
- boolean oldDiskSelected = (boolean) UI::QueryWidget(`id(`harddisk), `Value);
-
- any ret = UI::UserInput();
-
- if ( ret == `cancel )
- {
- break;
- }
-
- if ( UI::QueryWidget(`id(`harddisk), `Value) == true)
- {
- floppySelected = false;
- if ( !oldDiskSelected )
- {
- // changed from floppy to HD
- UI::ChangeWidget( `id(`path), `Value, lastHarddiskPath );
- }
- else
- {
- lastHarddiskPath = (string) UI::QueryWidget(`id(`path), `Value);
- }
- }
- else
- {
- floppySelected = true;
- if ( oldDiskSelected )
- {
- // changed from HD to floppy
- UI::ChangeWidget( `id(`path), `Value, lastFloppyPath );
- }
- else
- {
- lastFloppyPath = (string) UI::QueryWidget(`id(`path), `Value);
- }
- }
-
- if ( ret == `load )
- {
- if ( loadPackageSelection() )
- {
- break;
- }
- }
-
- if ( ret == `save )
- {
- if ( savePackageSelection( true ) )
- {
- break;
- }
- }
- }
-
- UI::CloseDialog();
- };
-
-
-
-
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.4/src/modules/Packages.ycp new/yast2-packager-2.15.5/src/modules/Packages.ycp
--- old/yast2-packager-2.15.4/src/modules/Packages.ycp 2006-12-14 14:12:16.000000000 +0100
+++ new/yast2-packager-2.15.5/src/modules/Packages.ycp 2007-01-26 10:36:11.000000000 +0100
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 34953 2006-12-14 13:12:11Z lslezak $
+ * $Id: Packages.ycp 35648 2007-01-26 09:36:08Z lslezak $
*/
{
@@ -522,30 +522,6 @@
/**
- * Compute language dependant packages
- * @return list(string)
- */
- define list<string> languagePackages ()
- {
- list<string> packages = [];
- list<string> locales = Pkg::GetAdditionalLocales();
- locales = prepend (locales, Pkg::GetLocale());
- string transpac = "yast2-trans-";
-
- foreach (string loc, locales, {
- if (Pkg::IsAvailable (transpac + loc))
- packages = add (packages, transpac + loc);
- else if (Pkg::IsAvailable (transpac + substring (loc, 0, 2)))
- packages = add (packages, transpac + substring (loc, 0, 2));
- else
- y2warning ("No locale package found for %1", loc);
- });
- y2milestone ("Language packages: %1", packages);
- return packages;
- }
-
-
- /**
* Compute board (vendor) dependant packages
* @return list(string)
*/
@@ -675,8 +651,6 @@
y2milestone ("Not selecting java packages");
}
- install_list = (list<string>) union (install_list, languagePackages ());
-
install_list = (list<string>) union (install_list, boardPackages ());
// add packages required to access the installation source in the 2nd stage and at run-time
@@ -924,7 +898,7 @@
// Set languages for packagemanager. Always set the UI language. Set
// language for additional packages only in Stage::initial ().
- Pkg::SetLocale (Language::language);
+ Pkg::SetTextLocale (Language::language);
boolean again = true;
theSources = Pkg::SourceStartCache (true); // dummy in 1st stage
@@ -1235,7 +1209,7 @@
list<map> selected_selections = filter(map s, Pkg::ResolvableProperties("", `selection, ""), {return s["status"]:`unknown == `selected;});
// selected languages
- list<string> selected_languages = (list<string>)union([Pkg::GetLocale()], Pkg::GetAdditionalLocales());
+ list<string> selected_languages = (list<string>)union([Pkg::GetPackageLocale()], Pkg::GetAdditionalLocales());
// if the package selection has not been changed the cache is up to date
@@ -1331,7 +1305,7 @@
cached_proposal_products = filter(map p, Pkg::ResolvableProperties("", `product, ""), {return p["status"]:`unknown == `selected;});
cached_proposal_patches = filter(map p, Pkg::ResolvableProperties("", `patch, ""), {return p["status"]:`unknown == `selected;});
cached_proposal_selections = filter(map s, Pkg::ResolvableProperties("", `selection, ""), {return s["status"]:`unknown == `selected;});
- cached_proposal_languages = (list<string>)union([Pkg::GetLocale()], Pkg::GetAdditionalLocales());
+ cached_proposal_languages = (list<string>)union([Pkg::GetPackageLocale()], Pkg::GetAdditionalLocales());
UI::CloseDialog();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.4/VERSION new/yast2-packager-2.15.5/VERSION
--- old/yast2-packager-2.15.4/VERSION 2007-01-25 15:49:05.000000000 +0100
+++ new/yast2-packager-2.15.5/VERSION 2007-01-26 10:35:56.000000000 +0100
@@ -1 +1 @@
-2.15.4
+2.15.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org