Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2013-09-25 14:39:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2013-08-27 21:56:03.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2013-09-25 14:39:58.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 3 11:55:45 CEST 2013 - [email protected]
+
+- do not mention xorg-x11 in the control files (bnc#837450)
+- remove obsoleted part of X11 related code
+- 3.0.5
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.0.4.tar.bz2
New:
----
yast2-installation-3.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.mIuM3z/_old 2013-09-25 14:39:58.000000000 +0200
+++ /var/tmp/diff_new_pack.mIuM3z/_new 2013-09-25 14:39:58.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.0.4
+Version: 3.0.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-3.0.4.tar.bz2 -> yast2-installation-3.0.5.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/VERSION
new/yast2-installation-3.0.5/VERSION
--- old/yast2-installation-3.0.4/VERSION 2013-08-21 10:27:19.000000000
+0200
+++ new/yast2-installation-3.0.5/VERSION 2013-09-03 12:26:49.000000000
+0200
@@ -1 +1 @@
-3.0.4
+3.0.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/configure
new/yast2-installation-3.0.5/configure
--- old/yast2-installation-3.0.4/configure 2013-08-21 10:27:28.000000000
+0200
+++ new/yast2-installation-3.0.5/configure 2013-09-11 17:48:10.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-installation 3.0.4.
+# Generated by GNU Autoconf 2.69 for yast2-installation 3.0.5.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='3.0.4'
-PACKAGE_STRING='yast2-installation 3.0.4'
+PACKAGE_VERSION='3.0.5'
+PACKAGE_STRING='yast2-installation 3.0.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1258,7 +1258,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-installation 3.0.4 to adapt to many kinds of
systems.
+\`configure' configures yast2-installation 3.0.5 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1330,7 +1330,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 3.0.4:";;
+ short | recursive ) echo "Configuration of yast2-installation 3.0.5:";;
esac
cat <<\_ACEOF
@@ -1410,7 +1410,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 3.0.4
+yast2-installation configure 3.0.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1427,7 +1427,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-installation $as_me 3.0.4, which was
+It was created by yast2-installation $as_me 3.0.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2366,7 +2366,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='3.0.4'
+ VERSION='3.0.5'
cat >>confdefs.h <<_ACEOF
@@ -2489,7 +2489,7 @@
-VERSION="3.0.4"
+VERSION="3.0.5"
RPMNAME="yast2-installation"
MAINTAINER="Jiří Suchomel <[email protected]>"
@@ -3586,7 +3586,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-installation $as_me 3.0.4, which was
+This file was extended by yast2-installation $as_me 3.0.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3639,7 +3639,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-installation config.status 3.0.4
+yast2-installation config.status 3.0.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/configure.ac
new/yast2-installation-3.0.5/configure.ac
--- old/yast2-installation-3.0.4/configure.ac 2013-08-21 10:27:25.000000000
+0200
+++ new/yast2-installation-3.0.5/configure.ac 2013-09-11 17:48:06.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.ac for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(yast2-installation, 3.0.4, http://bugs.opensuse.org/,
yast2-installation)
+AC_INIT(yast2-installation, 3.0.5, http://bugs.opensuse.org/,
yast2-installation)
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="3.0.4"
+VERSION="3.0.5"
RPMNAME="yast2-installation"
MAINTAINER="Jiří Suchomel <[email protected]>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/control/control.SLED.xml
new/yast2-installation-3.0.5/control/control.SLED.xml
--- old/yast2-installation-3.0.4/control/control.SLED.xml 2013-05-28
10:31:33.000000000 +0200
+++ new/yast2-installation-3.0.5/control/control.SLED.xml 2013-09-03
12:26:49.000000000 +0200
@@ -283,7 +283,7 @@
<label_id>dummy_desktop</label_id>
<logon>xdm</logon>
<cursor>DMZ</cursor>
- <packages>xorg-x11</packages>
+ <packages>xorg-x11-server</packages>
<order config:type="integer">6</order>
<patterns>x11 base</patterns>
<icon>yast-x11</icon>
@@ -295,7 +295,7 @@
<label_id>dummy_desktop</label_id>
<logon>xdm</logon>
<cursor>DMZ</cursor>
- <packages>xorg-x11</packages>
+ <packages></packages>
<order config:type="integer">8</order>
<patterns>enhanced_base</patterns>
<icon>yast-sshd</icon>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/control/control.SLES.xml
new/yast2-installation-3.0.5/control/control.SLES.xml
--- old/yast2-installation-3.0.4/control/control.SLES.xml 2013-05-28
10:31:33.000000000 +0200
+++ new/yast2-installation-3.0.5/control/control.SLES.xml 2013-09-03
12:26:49.000000000 +0200
@@ -235,7 +235,7 @@
<label_id>dummy_desktop</label_id>
<logon>xdm</logon>
<cursor>DMZ</cursor>
- <packages>xorg-x11</packages>
+ <packages>xorg-x11-server</packages>
<order config:type="integer">6</order>
<patterns>x11 base</patterns>
<icon>yast-x11</icon>
@@ -247,7 +247,7 @@
<label_id>dummy_desktop</label_id>
<logon>xdm</logon>
<cursor>DMZ</cursor>
- <packages>xorg-x11</packages>
+ <packages></packages>
<order config:type="integer">8</order>
<patterns>enhanced_base</patterns>
<icon>yast-sshd</icon>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.0.4/control/control.openSUSE.xml
new/yast2-installation-3.0.5/control/control.openSUSE.xml
--- old/yast2-installation-3.0.4/control/control.openSUSE.xml 2013-07-25
16:16:50.000000000 +0200
+++ new/yast2-installation-3.0.5/control/control.openSUSE.xml 2013-09-03
12:26:49.000000000 +0200
@@ -335,7 +335,7 @@
<label_id>desktop_min_x</label_id>
<logon>xdm</logon>
<cursor>DMZ</cursor>
- <packages>xorg-x11 branding-openSUSE</packages>
+ <packages>xorg-x11-server branding-openSUSE</packages>
<order config:type="integer">6</order>
<patterns>x11 base</patterns>
<icon>yast-x11</icon>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/control/control.xml
new/yast2-installation-3.0.5/control/control.xml
--- old/yast2-installation-3.0.4/control/control.xml 2013-01-22
11:22:35.000000000 +0100
+++ new/yast2-installation-3.0.5/control/control.xml 2013-09-03
12:26:49.000000000 +0200
@@ -197,7 +197,6 @@
<unique_id>hardware_continue</unique_id>
<enable_skip>yes</enable_skip>
<proposal_modules config:type="list">
- <proposal_module>x11</proposal_module>
<proposal_module>printer</proposal_module>
<proposal_module>sound</proposal_module>
<proposal_module>tv</proposal_module>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/src/Makefile.am
new/yast2-installation-3.0.5/src/Makefile.am
--- old/yast2-installation-3.0.4/src/Makefile.am 2013-07-30
13:08:31.000000000 +0200
+++ new/yast2-installation-3.0.5/src/Makefile.am 2013-09-03
12:26:49.000000000 +0200
@@ -1,7 +1,6 @@
# Sources for installation
module_DATA = \
- modules/X11Version.rb \
modules/ImageInstallation.rb \
modules/InstData.rb \
modules/Vendor.rb \
@@ -71,8 +70,7 @@
clients/inst_deploy_image.rb \
clients/ldconfig_finish.rb \
clients/inst_complex_welcome.rb \
- clients/inst_mode.rb \
- clients/inst_x11.rb
+ clients/inst_mode.rb
yncludedir = @yncludedir@/installation
ynclude_DATA = \
@@ -105,4 +103,4 @@
EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA)
$(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA)
-include $(top_srcdir)/Makefile.am.common
\ No newline at end of file
+include $(top_srcdir)/Makefile.am.common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/src/Makefile.in
new/yast2-installation-3.0.5/src/Makefile.in
--- old/yast2-installation-3.0.4/src/Makefile.in 2013-08-21
10:27:30.000000000 +0200
+++ new/yast2-installation-3.0.5/src/Makefile.in 2013-09-11
17:48:13.000000000 +0200
@@ -233,7 +233,6 @@
yncludedir = @yncludedir@/installation
ystartupdir = @ystartupdir@
module_DATA = \
- modules/X11Version.rb \
modules/ImageInstallation.rb \
modules/InstData.rb \
modules/Vendor.rb \
@@ -303,8 +302,7 @@
clients/inst_deploy_image.rb \
clients/ldconfig_finish.rb \
clients/inst_complex_welcome.rb \
- clients/inst_mode.rb \
- clients/inst_x11.rb
+ clients/inst_mode.rb
ynclude_DATA = \
include/installation/inst_inc_second.rb \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.0.4/src/clients/inst_proposal.rb
new/yast2-installation-3.0.5/src/clients/inst_proposal.rb
--- old/yast2-installation-3.0.4/src/clients/inst_proposal.rb 2013-08-07
13:24:36.000000000 +0200
+++ new/yast2-installation-3.0.5/src/clients/inst_proposal.rb 2013-09-11
08:46:50.000000000 +0200
@@ -898,9 +898,12 @@
@submodules_presentation = Builtins.maplist(modules) do |mod|
Ops.get_string(mod, 0, "")
end
+
p = AutoinstConfig.getProposalList
- @submodules_presentation = Builtins.filter(@submodules_presentation)
do |v|
- Builtins.contains(p, v) || p == []
+
+ if p != nil && p != []
+ # array intersection
+ @submodules_presentation = @submodules_presentation & v
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/src/clients/inst_x11.rb
new/yast2-installation-3.0.5/src/clients/inst_x11.rb
--- old/yast2-installation-3.0.4/src/clients/inst_x11.rb 2013-07-30
13:08:31.000000000 +0200
+++ new/yast2-installation-3.0.5/src/clients/inst_x11.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,65 +0,0 @@
-# encoding: utf-8
-
-#
------------------------------------------------------------------------------
-# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
-#
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of version 2 of the GNU General Public License as published by the
-# Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, contact Novell, Inc.
-#
-# To contact Novell about this file by physical or electronic mail, you may
find
-# current contact information at www.novell.com.
-#
------------------------------------------------------------------------------
-
-# *************
-# FILE : inst_x11.ycp
-# ***************
-# PROJECT : YaST2
-# :
-# AUTHOR : Marcus Schäfer <[email protected]>
-# :
-# BELONGS TO : YaST2
-# : (X11 integration part using SaX2/ISaX)
-# :
-# DESCRIPTION : The installation workflow will call inst_x11
-# : This module will check if we have X11 installed
-# : and import the main X11 module (x11.ycp)
-# :
-# STATUS : Development
-# *
-# * $Id$
-module Yast
- class InstX11Client < Client
- def main
- Yast.import "X11Version"
- Yast.import "Mode"
- Yast.import "Installation"
- Yast.import "Arch"
- Yast.import "GetInstArgs"
-
- @next = GetInstArgs.enable_next
- @back = GetInstArgs.enable_back
-
- #==========================================
- # Check if X11 is installed
- #------------------------------------------
- if X11Version.have_x11 && Installation.x11_setup_needed &&
- Arch.x11_setup_needed
- @ret = WFM.CallFunction("x11", [@back, @next])
- return deep_copy(@ret)
- else
- return :next
- end
- end
- end
-end
-
-Yast::InstX11Client.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/src/clients/x11_finish.rb
new/yast2-installation-3.0.5/src/clients/x11_finish.rb
--- old/yast2-installation-3.0.4/src/clients/x11_finish.rb 2013-07-30
13:08:31.000000000 +0200
+++ new/yast2-installation-3.0.5/src/clients/x11_finish.rb 2013-09-03
12:26:49.000000000 +0200
@@ -33,13 +33,9 @@
module Yast
class X11FinishClient < Client
def main
- Yast.import "Pkg"
- Yast.import "UI"
textdomain "installation"
- Yast.import "X11Version"
- Yast.import "Mode"
Yast.import "Installation"
Yast.import "String"
@@ -73,62 +69,7 @@
"when" => [:installation, :update, :autoinst]
}
elsif @func == "Write"
- # --------------------------------------------------------------
- # Copy /etc/XF86Config into built system so that the
- # second phase of the installation can find it.
- X11Version.GetX11Link
-
- # Check if X11 package is installed.
- @x11_installed = Pkg.IsProvided("xorg-x11")
- @x11_installed = Pkg.IsSelected("xorg-x11") if !@x11_installed
-
- Builtins.y2milestone("x11_installed: <%1>", @x11_installed)
-
- if @x11_installed
- if Mode.update
- if X11Version.versionLink == "3"
- #========================================
- # Update mode...
- #----------------------------------------
- # - set a flag at the end of the config to indicate later
migration
- # - copy the config to the installed system
- Builtins.y2milestone("Update: XFree86 version 3 detected")
- @filename = "/etc/XF86Config"
- WFM.Execute(
- path(".local.bash"),
- Ops.add("echo -e '\n#3x' >> ", @filename)
- )
- SCR.Execute(
- path(".target.bash"),
- Ops.add(
- Ops.add(
- Ops.add(
- Ops.add(
- Ops.add(
- "/bin/ln -sf " + "'",
- String.Quote(Installation.destdir)
- ),
- "/usr/X11R6/bin/XFree86' "
- ),
- "'"
- ),
- String.Quote(Installation.destdir)
- ),
- "/var/X11R6/bin/X'"
- )
- )
- Builtins.y2milestone(
- "Update: Include X11 config [3.x] to installed system"
- )
- Builtins.y2milestone(
- "Update: X11 config [3.x] prepared for migration to [4.x]"
- )
- InjectFile(@filename)
- end
- end
- end
- # ... /
# create backup copy from from inst-sys config to be available in
installed
# or updated system copy /etc/X11/XF86Config from inst-sys to
# [/mnt]/etc/X11/xorg.conf.install
@@ -137,19 +78,8 @@
"Include X11 config [instsys] to installed system: xorg.conf.install"
)
@filename = "/etc/X11/xorg.conf"
- WFM.Execute(
- path(".local.bash"),
- Ops.add(
- Ops.add(
- Ops.add(
- Ops.add(Ops.add(Ops.add("/bin/cp ", @filename), " "), "'"),
- String.Quote(Installation.destdir)
- ),
- "/etc/X11/xorg.conf"
- ),
- ".install'"
- )
- )
+ WFM.Execute(path(".local.bash"),
+ "/bin/cp " + @filename + " '" + String.Quote(Installation.destdir) +
@filename + ".install'")
else
Builtins.y2error("unknown function: %1", @func)
@ret = nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.4/src/modules/X11Version.rb
new/yast2-installation-3.0.5/src/modules/X11Version.rb
--- old/yast2-installation-3.0.4/src/modules/X11Version.rb 2013-07-30
13:08:31.000000000 +0200
+++ new/yast2-installation-3.0.5/src/modules/X11Version.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,187 +0,0 @@
-# encoding: utf-8
-
-#
------------------------------------------------------------------------------
-# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
-#
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of version 2 of the GNU General Public License as published by the
-# Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, contact Novell, Inc.
-#
-# To contact Novell about this file by physical or electronic mail, you may
find
-# current contact information at www.novell.com.
-#
------------------------------------------------------------------------------
-
-# *************
-# FILE : X11Version.ycp
-# ***************
-# PROJECT : YaST2
-# :
-# AUTHOR : Marcus Schäfer <[email protected]>
-# :
-# BELONGS TO : YaST2
-# : (X11 integration part using SaX2/ISaX)
-# :
-# DESCRIPTION : Provides a function to determine the _used_ XFree-version
-# : in a running system. Provide information about the
-# : package selection status which may told us:
-# : there is no X11 installed
-# :
-# :
-# STATUS : Development
-# *
-# * $Id$
-require "yast"
-
-module Yast
- class X11VersionClass < Module
- def main
- textdomain "installation"
-
- Yast.import "Directory"
- Yast.import "Installation"
- Yast.import "Package"
- Yast.import "Mode"
-
- #=======================================
- # System Global Variables
- #---------------------------------------
- @version = ""
- @versionLink = ""
- X11Version()
- end
-
- #=======================================
- # Global Functions
- #---------------------------------------
- #---[ GetVersion ]----//
- def GetVersion
- # ...
- # Set the global variable version to:
- # "" - No X11 found
- # "3" - XFree86 Version 3.x
- # "4" - XFree86 Version 4.x
- # ---
- # NOTE: This is highly dependent on the X11-infrastructure
- # and must be accommodated to any changes there.
- # ---
- @version = "" # init
-
- # ...
- # Take a look into the system....
- # ask the libhd for the configuration stuff to this card
- # if there is only one entry pointing to XFree86 version 3
- # XFree86 3 has to be used for this card
- # ---
- gfxcards = Convert.convert(
- SCR.Read(path(".probe.display")),
- :from => "any",
- :to => "list <map>"
- )
- # more cards -> ver=4
- if Ops.greater_than(Builtins.size(gfxcards), 1)
- @version = "4"
- # one cards -> inspect drivers
- elsif Builtins.size(gfxcards) == 1
- Builtins.foreach(gfxcards) do |gfxcard|
- drivers = Ops.get_list(gfxcard, "x11", [])
- # do we have any 4 driver?
- Builtins.foreach(drivers) do |driver|
- if @version == ""
- @version = "4" if Ops.get_string(driver, "version", "") == "4"
- end
- end
- # do we have any 3 driver?
- Builtins.foreach(drivers) do |driver|
- if @version == ""
- @version = "3" if Ops.get_string(driver, "version", "") == "3"
- end
- end
- end
- end
- # not sure about default
- @version = "4" if @version == ""
-
- Builtins.y2milestone("xfree_version: <%1>", @version)
- @version
- end
-
- #---[ X11Version ]----//
- def X11Version
- # ...
- # The module constructor. Sets some proprietary module data defined
- # for public access This is done only once (and automatically)
- # when the module is loaded for the first time
- # ---
- GetVersion()
- nil
- end
-
- #---[ GetX11Link ]----//
- def GetX11Link
- ret = "4"
-
- count = 0
- file = Ops.add(Installation.destdir, "/X") # "/usr/X11R6/bin/X";
-
- while Ops.less_than(count, 10)
- Builtins.y2debug("Inspecting: %1 (%2)", file, count)
- stat = Convert.to_map(SCR.Read(path(".target.lstat"), file))
- islink = Ops.get_boolean(stat, "islink", false)
- Builtins.y2debug("islink=%1 (%2)", islink, stat)
- break if islink == nil || islink == false
- file = Convert.to_string(SCR.Read(path(".target.symlink"), file))
- break if file == nil
- count = Ops.add(count, 1)
- end
-
- ret = "3" if file != nil && !Builtins.regexpmatch(file, "XFree86")
- Builtins.y2milestone("X link: %1", ret)
- ret
- end
-
- #---[ have_x11 ]----//
- def have_x11
- # ...
- # check if the required packages are installed
- # ---
- ret = true
- pacs = ["xorg-x11", "yast2-x11", "sax2"]
- # Dont ask for installing packages, just return in autoinst mode
- if Mode.autoinst
- ret = Package.InstalledAll(pacs)
- else
- if !Package.InstallAllMsg(
- pacs,
- # notification 1/2
- _(
- "<p>To access the X11 system, the <b>%1</b> package must be
installed.</p>"
- ) +
- # notification 2/2
- _("<p>Do you want to install it now?</p>")
- )
- ret = false
- end
- end
- Builtins.y2milestone("have_x11 = %1", ret)
- ret
- end
-
- publish :variable => :version, :type => "string"
- publish :variable => :versionLink, :type => "string"
- publish :function => :GetVersion, :type => "string ()"
- publish :function => :X11Version, :type => "void ()"
- publish :function => :GetX11Link, :type => "string ()"
- publish :function => :have_x11, :type => "boolean ()"
- end
-
- X11Version = X11VersionClass.new
- X11Version.main
-end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
