Hello community,
here is the log from the commit of package yast2-update
checked in at Tue Aug 29 16:40:03 CEST 2006.
--------
--- yast2-update/yast2-update.changes 2006-08-22 15:23:46.000000000 +0200
+++ yast2-update/yast2-update.changes 2006-08-29 08:41:36.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Aug 29 08:40:50 CEST 2006 - locilka@suse.cz
+
+- Better wording for table of partition names to be selected for
+ update, added File System column. (#166478)
+- 2.13.35
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.13.34.tar.bz2
New:
----
yast2-update-2.13.35.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.vaPMmA/_old 2006-08-29 16:38:30.000000000 +0200
+++ /var/tmp/diff_new_pack.vaPMmA/_new 2006-08-29 16:38:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.13.34)
+# spec file for package yast2-update (Version 2.13.35)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-update
-Version: 2.13.34
+Version: 2.13.35
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.13.34.tar.bz2
+Source0: yast2-update-2.13.35.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml
Requires: yast2 yast2-installation yast2-storage yast2-packager
@@ -37,9 +37,10 @@
--------
Stefan Schubert
Arvin Schnell
+ Jiri Srain
%prep
-%setup -n yast2-update-2.13.34
+%setup -n yast2-update-2.13.35
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +75,10 @@
%doc %{prefix}/share/doc/packages/yast2-update
%changelog -n yast2-update
+* Tue Aug 29 2006 - locilka@suse.cz
+- Better wording for table of partition names to be selected for
+ update, added File System column. (#166478)
+- 2.13.35
* Tue Aug 22 2006 - locilka@suse.cz
- Deprecated builtins replaced with new ones
- 2.13.34
++++++ yast2-update-2.13.34.tar.bz2 -> yast2-update-2.13.35.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.34/VERSION new/yast2-update-2.13.35/VERSION
--- old/yast2-update-2.13.34/VERSION 2006-08-22 15:22:50.000000000 +0200
+++ new/yast2-update-2.13.35/VERSION 2006-08-29 08:42:02.000000000 +0200
@@ -1 +1 @@
-2.13.34
+2.13.35
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.34/configure new/yast2-update-2.13.35/configure
--- old/yast2-update-2.13.34/configure 2006-08-22 14:33:19.000000000 +0200
+++ new/yast2-update-2.13.35/configure 2006-08-29 08:52:16.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-update 2.13.33.
+# Generated by GNU Autoconf 2.59 for yast2-update 2.13.35.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-update'
PACKAGE_TARNAME='yast2-update'
-PACKAGE_VERSION='2.13.33'
-PACKAGE_STRING='yast2-update 2.13.33'
+PACKAGE_VERSION='2.13.35'
+PACKAGE_STRING='yast2-update 2.13.35'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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-update 2.13.33 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.13.35 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-update 2.13.33:";;
+ short | recursive ) echo "Configuration of yast2-update 2.13.35:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-update configure 2.13.33
+yast2-update configure 2.13.35
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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-update $as_me 2.13.33, which was
+It was created by yast2-update $as_me 2.13.35, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-update'
- VERSION='2.13.33'
+ VERSION='2.13.35'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.33"
+VERSION="2.13.35"
RPMNAME="yast2-update"
MAINTAINER="Lukas Ocilka "
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-update $as_me 2.13.33, which was
+This file was extended by yast2-update $as_me 2.13.35, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-update config.status 2.13.33
+yast2-update config.status 2.13.35
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.34/configure.in new/yast2-update-2.13.35/configure.in
--- old/yast2-update-2.13.34/configure.in 2006-08-22 14:33:15.000000000 +0200
+++ new/yast2-update-2.13.35/configure.in 2006-08-29 08:52:12.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-update, 2.13.33, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 2.13.35, http://bugs.opensuse.org/, yast2-update)
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.13.33"
+VERSION="2.13.35"
RPMNAME="yast2-update"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.34/kernel-update-tool.pot new/yast2-update-2.13.35/kernel-update-tool.pot
--- old/yast2-update-2.13.34/kernel-update-tool.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-update-2.13.35/kernel-update-tool.pot 2006-08-29 09:02:00.000000000 +0200
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-29 09:02+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/clients/kernel-update.ycp:188
+msgid "Warning"
+msgstr ""
+
+#: src/clients/kernel-update.ycp:189
+msgid "Abort the kernel upgrade?"
+msgstr ""
+
+#: src/clients/kernel-update.ycp:246
+msgid "Alternate Download Location"
+msgstr ""
+
+#: src/clients/kernel-update.ycp:509
+msgid "Kernel Update Status Log"
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.34/src/include/rootpart.ycp new/yast2-update-2.13.35/src/include/rootpart.ycp
--- old/yast2-update-2.13.34/src/include/rootpart.ycp 2006-06-26 09:11:51.000000000 +0200
+++ new/yast2-update-2.13.35/src/include/rootpart.ycp 2006-08-28 17:42:55.000000000 +0200
@@ -20,21 +20,77 @@
import "Report";
import "Update";
+// Returns boolean whether partition can be
+// a Linux 'root' file system
+boolean CanBeLinuxRootFS (symbol partition_fs) {
+ if (partition_fs == nil) {
+ y2error("partition_fs not defined!");
+ return false;
+ }
+
+ // possible_root_fs contains list of supported FSs
+ return contains (RootPart::possible_root_fs, partition_fs);
+}
-list<term> make_partition_list (boolean withall) {
+list <term> make_partition_list (boolean withall) {
list<term> part_list = [];
- foreach (string p, map i, RootPart::rootPartitions, {
+ foreach (string partition, map i, RootPart::rootPartitions, {
+ // see https://bugzilla.novell.com/attachment.cgi?id=96783&action=view
+
if (i[`valid]:false || withall)
{
- string s = i[`name]:"error";
- if (s == "unknown") s = _("Unknown");
-
- string a = i[`arch]:"error";
- if (a == "unknown") a = _("Unknown");
+ // `ext2, `jfs, ...
+ symbol part_fs = (symbol) i[`fs]:nil;
+ string part_fs_name = tostring (part_fs);
+ if (part_fs_name != nil && regexpmatch (part_fs_name, "^`(.*)$")) {
+ part_fs_name = regexpsub (part_fs_name, "^`(.*)$", "\\1");
+ }
- string l = i[`label]:"";
+ string system = i[`name]:"error";
+ // unknown system
+ if (system == "unknown") {
+ if (part_fs != nil) {
+ if (CanBeLinuxRootFS (part_fs)) {
+ // Table item (unknown system)
+ system = _("Unknown Linux");
+ } else {
+ // Table item (unknown system)
+ system = _("Unknown or Non-Linux");
+ }
+ } else {
+ // Table item (unknown system [neither openSUSE 11.1 nor SLES 14 nor ...])
+ if (system == "unknown") system = _("Unknown");
+ }
+ }
- part_list = add (part_list, `item (`id (p), s, p, a, l));
+ string arch = i[`arch]:"error";
+ // Table item (unknown architecture)
+ if (arch == "unknown") arch = _("Unknown");
+
+ // fist, use the name of file system (with short name for Linux)
+ // then the file system short name
+ // then "Unknown"
+ string fs = "";
+
+ // is a linux fs, can be a root fs, has a fs name
+ if (part_fs != nil && i[`fstype]:nil != nil && CanBeLinuxRootFS (part_fs) && part_fs_name != nil) {
+ fs = sformat(
+ _("%1 (%2)"),
+ i[`fstype]:"", part_fs_name
+ );
+ } else {
+ fs = i[`fstype]:i[`fs]:"";
+ }
+ // Table item (unknown file system)
+ if (fs == "") fs = _("Unknown");
+
+ string label = i[`label]:"";
+
+ part_list = add (part_list,
+ `item (`id (partition),
+ system, partition, arch, fs, label
+ )
+ );
}
});
return part_list;
@@ -97,13 +153,17 @@
`Table (`id (`partition),
`opt(`hstretch),
// table header
- `header (_("System"),
- // table header
- _("Partition"),
- // table header
- _("Architecture"),
- // table header
- _("Label")),
+ `header (
+ _("System"),
+ // table header item
+ _("Partition"),
+ // table header item
+ _("Architecture"),
+ // table header item
+ _("File System"),
+ // table header item
+ _("Label")
+ ),
partition_list),
`Left(`CheckBox(`id(`showall), `opt(`notify),
// check box
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.34/src/modules/RootPart.ycp new/yast2-update-2.13.35/src/modules/RootPart.ycp
--- old/yast2-update-2.13.34/src/modules/RootPart.ycp 2006-08-22 15:23:57.000000000 +0200
+++ new/yast2-update-2.13.35/src/modules/RootPart.ycp 2006-08-29 08:42:47.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose: Responsible for searching of root partitions and
* mounting of target partitions.
*
- * $Id: RootPart.ycp 32490 2006-08-22 13:25:32Z locilka $
+ * $Id: RootPart.ycp 32600 2006-08-29 06:44:21Z locilka $
*/
{
module "RootPart";
@@ -29,6 +29,8 @@
include "partitioning/custom_part_helptexts.ycp";
include "partitioning/custom_part_dialogs.ycp";
+ // all supported filesystems
+ global list possible_root_fs = [ `ext2, `ext3, `reiser, `xfs, `jfs ];
// Selected root partition for the update or boot.
global string selectedRootPartition = "";
@@ -91,8 +93,26 @@
global define string GetInfoOfSelected (symbol what)
{
map i = rootPartitions[selectedRootPartition]:$[];
- // Unkown for unknown system
- return i[what]:_("Unknown");
+
+ if (what == `name) {
+ // Name is known
+ if (i[what]:"" != "") {
+ return i[what]:"";
+
+ // Linux partition, but no root FS found
+ } else if (contains (possible_root_fs, i[`fs]:`nil)) {
+ // label - name of sustem to update
+ return _("Unknown Linux System");
+
+ // Non-Linux
+ } else {
+ // label - name of sustem to update
+ return _("Non-Linux System");
+ }
+ } else {
+ // label - name of sustem to update
+ return i[what]:_("Unknown");
+ }
}
@@ -961,16 +981,22 @@
*/
define map CheckPartition (map partition)
{
- map freshman = $[`valid : false, `name : "unknown", `arch : "unknown", `label: partition["label"]:"" ];
+ map freshman = $[
+ `valid : false,
+ `name : "unknown",
+ `arch : "unknown",
+ `label: partition["label"]:"",
+ `fs : partition["detected_fs"]:`unknown,
+ `fstype : partition["fstype"]:"unknown",
+ ];
string p_dev = partition["device"]:"error";
integer p_fsid = partition["fsid"]:0;
symbol p_type = partition["type"]:`primary;
symbol p_detect_fs = partition["detected_fs"]:`unknown;
- list possible_root_fs = [ `ext2, `ext3, `reiser, `xfs, `jfs ];
-
if ((p_fsid == 131 || p_type == `lvm || p_type == `sw_raid) &&
+ // possible root FS
contains (possible_root_fs, p_detect_fs))
{
map mt_map = $[
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org