Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at Wed Aug 3 16:25:43 CEST 2011.
--------
--- yast2-packager/yast2-packager.changes 2011-07-26 14:29:56.000000000
+0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes
2011-08-03 10:51:47.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Aug 3 08:49:18 UTC 2011 - lsle...@suse.cz
+
+- use term "Software manager" instead of "Package manager"
+ (bnc#585679)
+- 2.21.8
+
+-------------------------------------------------------------------
+Tue Aug 2 15:41:35 UTC 2011 - lsle...@suse.cz
+
+- fixed biosdevname package installation (bnc#709797)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.21.7.tar.bz2
New:
----
yast2-packager-2.21.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.Iue9aa/_old 2011-08-03 16:23:31.000000000 +0200
+++ /var/tmp/diff_new_pack.Iue9aa/_new 2011-08-03 16:23:31.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-packager
-Version: 2.21.7
+Version: 2.21.8
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.21.7.tar.bz2
+Source0: yast2-packager-2.21.8.tar.bz2
Prefix: /usr
@@ -100,7 +100,7 @@
(webpin) and installing them via OneClickInstall
%prep
-%setup -n yast2-packager-2.21.7
+%setup -n yast2-packager-2.21.8
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-packager-2.21.7.tar.bz2 -> yast2-packager-2.21.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.7/configure
new/yast2-packager-2.21.8/configure
--- old/yast2-packager-2.21.7/configure 2011-07-26 14:28:21.000000000 +0200
+++ new/yast2-packager-2.21.8/configure 2011-08-03 10:51:13.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-packager 2.21.7.
+# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.8.
#
# 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.21.7'
-PACKAGE_STRING='yast2-packager 2.21.7'
+PACKAGE_VERSION='2.21.8'
+PACKAGE_STRING='yast2-packager 2.21.8'
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-packager 2.21.7 to adapt to many kinds of
systems.
+\`configure' configures yast2-packager 2.21.8 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-packager 2.21.7:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.21.8:";;
esac
cat <<\_ACEOF
@@ -1380,7 +1380,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.21.7
+yast2-packager configure 2.21.8
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-packager $as_me 2.21.7, which was
+It was created by yast2-packager $as_me 2.21.8, 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-packager'
- VERSION='2.21.7'
+ VERSION='2.21.8'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.21.7"
+VERSION="2.21.8"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
@@ -3379,7 +3379,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.21.7, which was
+This file was extended by yast2-packager $as_me 2.21.8, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3432,7 +3432,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.21.7
+yast2-packager config.status 2.21.8
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-packager-2.21.7/configure.in
new/yast2-packager-2.21.8/configure.in
--- old/yast2-packager-2.21.7/configure.in 2011-07-26 14:28:18.000000000
+0200
+++ new/yast2-packager-2.21.8/configure.in 2011-08-03 10:51:11.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.21.7, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.21.8, 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.21.7"
+VERSION="2.21.8"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.7/src/clients/pkg_finish.ycp
new/yast2-packager-2.21.8/src/clients/pkg_finish.ycp
--- old/yast2-packager-2.21.7/src/clients/pkg_finish.ycp 2009-11-26
07:52:26.000000000 +0100
+++ new/yast2-packager-2.21.8/src/clients/pkg_finish.ycp 2011-08-03
10:51:01.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsr...@suse.cz>
*
- * $Id: pkg_finish.ycp 59737 2009-11-24 14:34:51Z locilka $
+ * $Id: pkg_finish.ycp 65153 2011-08-03 08:50:57Z lslezak $
*
*/
@@ -99,7 +99,7 @@
return (any)$[
"steps" : 1,
// progress step title
- "title" : _("Saving the package manager configuration..."),
+ "title" : _("Saving the software manager configuration..."),
"when" : [ `installation, `update, `autoinst ],
];
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-2.21.7/src/clients/webpin_package_search.ycp
new/yast2-packager-2.21.8/src/clients/webpin_package_search.ycp
--- old/yast2-packager-2.21.7/src/clients/webpin_package_search.ycp
2010-01-05 13:45:45.000000000 +0100
+++ new/yast2-packager-2.21.8/src/clients/webpin_package_search.ycp
2011-08-03 10:51:01.000000000 +0200
@@ -4,7 +4,7 @@
* Authors: Katarina Machalkova <kmachalk...@suse.cz>
* Lukas Ocilka <loci...@suse.cz>
*
- * $Id: webpin_package_search.ycp 60001 2009-12-08 13:00:37Z kmachalkova $
+ * $Id: webpin_package_search.ycp 65153 2011-08-03 08:50:57Z lslezak $
*
* This client provides UI for searching for packages
* via Webpin XML.
@@ -185,12 +185,12 @@
symbol ReadDialog() {
list <string> steps = [
_("Check Network Configuration"),
- _("Initialize Package Manager")
+ _("Initialize Software Manager")
];
list <string> actions = [
_("Checking Network Configuration ..."),
- _("Initializing Package Manager ... ")
+ _("Initializing Software Manager ... ")
];
Progress::New(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.7/src/modules/Packages.ycp
new/yast2-packager-2.21.8/src/modules/Packages.ycp
--- old/yast2-packager-2.21.7/src/modules/Packages.ycp 2011-07-25
10:27:14.000000000 +0200
+++ new/yast2-packager-2.21.8/src/modules/Packages.ycp 2011-08-03
10:45:15.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif <nas...@suse.de>
*
- * $Id: Packages.ycp 64686 2011-07-01 07:21:52Z lslezak $
+ * $Id: Packages.ycp 65146 2011-08-02 16:51:34Z lslezak $
*/
{
@@ -796,17 +796,111 @@
return packages;
}
+ /*
+ * check whether there is a bios name for a network interface
+ */
+ boolean detectBiosDevNames()
+ {
+ boolean ret = false;
+ list<map> netifs = (list<map>)SCR::Read(.probe.netif);
+
+ foreach(map netif, netifs, {
+ string dev_name = netif["dev_name"]:"unknown";
+ string command = sformat("/sbin/biosdevname --policy all_names
-i '%1'", String::Quote(dev_name));
+ y2milestone("Executing: %1", command);
+
+ map out = (map)SCR::Execute(.target.bash_output, command);
+ y2milestone("Result: %1", out);
+
+ if (out["exit"]:-1 == 0)
+ {
+ string bios_name = String::FirstChunk(out["stdout"]:"",
"\n");
+
+ if (bios_name != nil && bios_name != "" && bios_name !=
dev_name)
+ {
+ y2milestone("Found BIOS name for %1: %2", netif,
bios_name);
+ ret = true;
+ }
+ }
+ }
+ );
+
+ y2milestone("Detected BIOS name: %1", ret);
+
+ return ret;
+ }
+
+ /*
+ * CHeck whether this is a Dell system
+ */
+ boolean DellSystem()
+ {
+ boolean ret = false;
+ string command = "/usr/sbin/hwinfo --bios";
+ y2milestone("Executing: %1", command);
+
+ map out = (map)SCR::Execute(.target.bash_output, command);
+ y2milestone("Result: %1", out);
+
+ if (out["exit"]:-1 == 0)
+ {
+ list<string> lines = splitstring(out["stdout"]:"", "\n");
+
+ foreach(string line, lines, {
+ if (regexpmatch(line, "Vendor:.*Dell Inc.*"))
+ {
+ y2milestone("Found matching line: %1", line);
+ ret = true;
+ }
+ }
+ );
+ }
+
+ if (ret)
+ {
+ y2milestone("Detected a Dell system");
+ }
+
+ return ret;
+ }
+
define list<string> kernelCmdLinePackages()
{
list<string> ret = [];
- foreach (string part, splitstring (Kernel::GetCmdLine (), "\t "), {
- if (part == "biosdevname=1")
+ string biosdevname = (string)SCR::Read(.etc.install_inf.biosdevname);
+ y2milestone("read biosdevname option: %1", biosdevname);
+ boolean add_biosdevname = false;
+
+ if (biosdevname == "1")
+ {
+ y2milestone("Found biosdevname=1 kernel option, selecting
biosdevname package to install");
+ add_biosdevname = true;
+ }
+ else
+ {
+ string cmdline = (string)SCR::Read(.target.string, "/proc/cmdline");
+
+ if (!issubstring(cmdline, "biosdevname"))
+ {
+ y2milestone("Missing biosdevname option, autodetecting...");
+ if (DellSystem())
+ {
+ add_biosdevname = detectBiosDevNames();
+ }
+ }
+ else
{
- y2milestone("Found biosdevname=1 kernel option, selecting
biosdevname package to install");
- ret = add(ret, "biosdevname");
+ y2milestone("biosdevname disabled via kernel option, NOT
selecting biosdevname package to install");
}
- });
+ }
+
+ if (add_biosdevname)
+ {
+ ret = add(ret, "biosdevname");
+ }
+
+ y2milestone("Packages added by kernel command line: %1", ret);
return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.7/VERSION
new/yast2-packager-2.21.8/VERSION
--- old/yast2-packager-2.21.7/VERSION 2011-07-26 14:24:21.000000000 +0200
+++ new/yast2-packager-2.21.8/VERSION 2011-08-03 10:50:30.000000000 +0200
@@ -1 +1 @@
-2.21.7
+2.21.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
