Hello community,
here is the log from the commit of package yast2-instserver
checked in at Thu Dec 7 19:57:28 CET 2006.
--------
--- yast2-instserver/yast2-instserver.changes 2006-11-13 14:18:05.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-instserver/yast2-instserver.changes 2006-12-06 14:53:14.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Dec 6 14:17:39 CET 2006 - lslezak@suse.cz
+
+- write hostname to SLP registration file (#158172)
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-instserver-2.14.0.tar.bz2
New:
----
yast2-instserver-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.iVMk7a/_old 2006-12-07 19:56:52.000000000 +0100
+++ /var/tmp/diff_new_pack.iVMk7a/_new 2006-12-07 19:56:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-instserver (Version 2.14.0)
+# spec file for package yast2-instserver (Version 2.15.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-instserver
URL: http://www.suse.com/
-Version: 2.14.0
+Version: 2.15.0
Release: 1
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-instserver-2.14.0.tar.bz2
+Source0: yast2-instserver-2.15.0.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite
Requires: yast2, yast2-slp
@@ -37,7 +37,7 @@
Anas Nashif
%prep
-%setup -n yast2-instserver-2.14.0
+%setup -n yast2-instserver-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +76,9 @@
%dir /etc/apache2/conf.d
%changelog -n yast2-instserver
+* Wed Dec 06 2006 - lslezak@suse.cz
+- write hostname to SLP registration file (#158172)
+- 2.15.0
* Mon Nov 13 2006 - lslezak@suse.cz
- 2.14.0
* Wed Aug 16 2006 - lslezak@suse.cz
++++++ yast2-instserver-2.14.0.tar.bz2 -> yast2-instserver-2.15.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.14.0/VERSION new/yast2-instserver-2.15.0/VERSION
--- old/yast2-instserver-2.14.0/VERSION 2006-11-13 14:12:50.000000000 +0100
+++ new/yast2-instserver-2.15.0/VERSION 2006-12-06 14:17:35.000000000 +0100
@@ -1 +1 @@
-2.14.0
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.14.0/configure new/yast2-instserver-2.15.0/configure
--- old/yast2-instserver-2.14.0/configure 2006-11-13 14:14:10.000000000 +0100
+++ new/yast2-instserver-2.15.0/configure 2006-12-06 14:52:02.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-instserver 2.14.0.
+# Generated by GNU Autoconf 2.60 for yast2-instserver 2.15.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-instserver'
PACKAGE_TARNAME='yast2-instserver'
-PACKAGE_VERSION='2.14.0'
-PACKAGE_STRING='yast2-instserver 2.14.0'
+PACKAGE_VERSION='2.15.0'
+PACKAGE_STRING='yast2-instserver 2.15.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1180,7 +1180,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-instserver 2.14.0 to adapt to many kinds of systems.
+\`configure' configures yast2-instserver 2.15.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1251,7 +1251,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-instserver 2.14.0:";;
+ short | recursive ) echo "Configuration of yast2-instserver 2.15.0:";;
esac
cat <<\_ACEOF
@@ -1329,7 +1329,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-instserver configure 2.14.0
+yast2-instserver configure 2.15.0
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1343,7 +1343,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-instserver $as_me 2.14.0, which was
+It was created by yast2-instserver $as_me 2.15.0, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2144,7 +2144,7 @@
# Define the identity of the package.
PACKAGE='yast2-instserver'
- VERSION='2.14.0'
+ VERSION='2.15.0'
cat >>confdefs.h <<_ACEOF
@@ -2371,7 +2371,7 @@
-VERSION="2.14.0"
+VERSION="2.15.0"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
@@ -3227,7 +3227,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-instserver $as_me 2.14.0, which was
+This file was extended by yast2-instserver $as_me 2.15.0, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3270,7 +3270,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-instserver config.status 2.14.0
+yast2-instserver config.status 2.15.0
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-instserver-2.14.0/configure.in new/yast2-instserver-2.15.0/configure.in
--- old/yast2-instserver-2.14.0/configure.in 2006-11-13 14:14:05.000000000 +0100
+++ new/yast2-instserver-2.15.0/configure.in 2006-12-06 14:51:56.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-instserver, 2.14.0, http://bugs.opensuse.org/, yast2-instserver)
+AC_INIT(yast2-instserver, 2.15.0, http://bugs.opensuse.org/, yast2-instserver)
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.14.0"
+VERSION="2.15.0"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.14.0/src/Instserver.ycp new/yast2-instserver-2.15.0/src/Instserver.ycp
--- old/yast2-instserver-2.14.0/src/Instserver.ycp 2006-11-13 14:12:29.000000000 +0100
+++ new/yast2-instserver-2.15.0/src/Instserver.ycp 2006-12-06 14:51:49.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Installation Server settings, input and output functions
* Authors: Anas Nashif
*
- * $Id: Instserver.ycp 33335 2006-10-12 08:04:36Z lslezak $
+ * $Id: Instserver.ycp 34794 2006-12-06 13:51:46Z lslezak $
*
* Representation of the configuration of Installation Server.
* Input and output routines.
@@ -476,6 +476,17 @@
return (IP::ToString(ip));
}
+global string GetHostname()
+{
+ map output = (map)SCR::Execute( .target.bash_output, "/bin/hostname --long" );
+ y2milestone("hostname --long: %1", output);
+ string hostname = output["stdout"]:"";
+
+ hostname = splitstring(hostname, "\n")[0]:"";
+
+ return hostname;
+}
+
/**
* Write SLP configuration
*/
@@ -484,6 +495,7 @@
y2debug("WriteSLPReg(%1)", cm);
string ip = GetIPAddr();
+ string hostname = GetHostname();
string serv = "";
string regfile = sformat("YaST-%1.reg", cm["name"]:"" );
if (ServerSettings["service"]:`none == `nfs)
@@ -532,20 +544,16 @@
}
}
- string descr = sformat("%1 ++%2++", cm["LABEL"]:"" , cm["DISTPRODUCT"]:"" );
-
- string cmd = sformat("grep description %1 | grep -c \"%2\"", checkfiles, descr);
- map bashret = (map)SCR::Execute(.target.bash_output, cmd);
- y2debug("description bashret: %1", bashret);
- if (bashret["exit"]:-1 == 0)
+ string hostname_reg = "";
+ // add the hostname
+ if (hostname != nil && hostname != "" && haskey(attr, "label"))
{
- attr["description"] = sformat("%1 #%2", descr,
- substring(bashret["stdout"]:"", 0 , 1 ) );
- }
- else
- {
- attr["description"] = sformat("%1", descr );
+ hostname_reg = hostname + ": ";
}
+
+ string descr = sformat("%1 (%2)", cm["LABEL"]:"" , cm["DISTPRODUCT"]:"" );
+ attr["description"] = hostname_reg + descr;
+
string machine = "";
list<string> machines = [];
foreach(string k, any v, cm, ``{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org