Hello community,
here is the log from the commit of package yast2-profile-manager
checked in at Thu Nov 8 22:55:35 CET 2007.
--------
--- yast2-profile-manager/yast2-profile-manager.changes 2007-06-12 13:31:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-profile-manager/yast2-profile-manager.changes 2007-11-08 22:14:21.207256000 +0100
@@ -1,0 +2,9 @@
+Tue Nov 6 11:16:48 CET 2007 - jsuchome@suse.cz
+
+- read from correct config file (#337913)
+- do not write translated "file"/"service" into DB (#337913)
+- fixed checking for duplicate resources (#340182)
+- added "Active" header to table with resources (#340182)
+- 2.16.0
+
+-------------------------------------------------------------------
Old:
----
yast2-profile-manager-2.15.0.tar.bz2
New:
----
yast2-profile-manager-2.16.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-profile-manager.spec ++++++
--- /var/tmp/diff_new_pack.NM2582/_old 2007-11-08 22:54:53.000000000 +0100
+++ /var/tmp/diff_new_pack.NM2582/_new 2007-11-08 22:54:53.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-profile-manager (Version 2.15.0)
+# spec file for package yast2-profile-manager (Version 2.16.0)
#
# 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-profile-manager
-Version: 2.15.0
+Version: 2.16.0
Release: 1
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-profile-manager-2.15.0.tar.bz2
-prefix: /usr
+Source0: yast2-profile-manager-2.16.0.tar.bz2
+Prefix: /usr
BuildRequires: doxygen gcc-c++ libxcrypt-devel perl-XML-Writer scpm-devel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite yast2-users
Requires: yast2 yast2-users
Requires: scpm >= 0.9.4
-Summary: YaST2 Profile Configuration
+Summary: YaST2 - Profile Configuration
%description
This module is used to configure various settings for SCPM (System
@@ -35,7 +35,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-profile-manager-2.15.0
+%setup -n yast2-profile-manager-2.16.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -72,8 +72,13 @@
%{_libdir}/YaST2/plugin/libpy2ag_scpm.so
%{_libdir}/YaST2/plugin/libpy2ag_scpm.la
%doc %{prefix}/share/doc/packages/yast2-profile-manager
-
%changelog
+* Tue Nov 06 2007 - jsuchome@suse.cz
+- read from correct config file (#337913)
+- do not write translated "file"/"service" into DB (#337913)
+- fixed checking for duplicate resources (#340182)
+- added "Active" header to table with resources (#340182)
+- 2.16.0
* Tue Jun 12 2007 - jsuchome@suse.cz
- check if resource group is installed before selecting it (#143273)
- translate "file"/"service"
++++++ yast2-profile-manager-2.15.0.tar.bz2 -> yast2-profile-manager-2.16.0.tar.bz2 ++++++
++++ 12424 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.15.0/configure.in new/yast2-profile-manager-2.16.0/configure.in
--- old/yast2-profile-manager-2.15.0/configure.in 2007-06-12 13:25:25.000000000 +0200
+++ new/yast2-profile-manager-2.16.0/configure.in 2007-11-06 10:28:07.000000000 +0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-profile-manager
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-profile-manager, 2.15.0, http://bugs.opensuse.org/, yast2-profile-manager)
@@ -144,8 +144,8 @@
AC_PROG_CC
AC_PROG_CPP
-CFLAGS="${CFLAGS} -Wall -Wformat -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat"
+CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.15.0/Makefile.am new/yast2-profile-manager-2.16.0/Makefile.am
--- old/yast2-profile-manager-2.15.0/Makefile.am 2007-06-12 13:25:25.000000000 +0200
+++ new/yast2-profile-manager-2.16.0/Makefile.am 2007-11-06 10:28:07.000000000 +0100
@@ -30,7 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = agents agent-scpm doc src testsuite
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.15.0/missing new/yast2-profile-manager-2.16.0/missing
--- old/yast2-profile-manager-2.15.0/missing 2007-06-12 13:25:40.000000000 +0200
+++ new/yast2-profile-manager-2.16.0/missing 2007-11-06 10:28:21.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.15.0/src/dialogs.ycp new/yast2-profile-manager-2.16.0/src/dialogs.ycp
--- old/yast2-profile-manager-2.15.0/src/dialogs.ycp 2007-06-12 13:21:05.000000000 +0200
+++ new/yast2-profile-manager-2.16.0/src/dialogs.ycp 2007-11-08 16:30:36.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Suchomel
*
- * $Id: dialogs.ycp 31672 2006-06-26 14:51:50Z jsuchome $
+ * $Id: dialogs.ycp 38405 2007-06-12 11:31:28Z jsuchome $
*/
{
@@ -163,20 +163,26 @@
// map for saving user_defined flags of each resource
map user_defined = $[];
+ // resource type (menu entry)
+ string filestring = _("File");
+ // resource type (menu entry)
+ string servicestring= _("Service");
map type2string = $[
- // resource type (menu entry)
- "file" : _("File"),
- // resource type (menu entry)
- "service" : _("Service"),
+ "file" : filestring,
+ "service" : servicestring
+ ];
+ map string2type = $[
+ filestring : "file",
+ servicestring : "service",
];
/**
* Scan table items for presence of given resource
*/
- define boolean has_resource (string name, string type) ``{
-
- return (contains (items, `item(`id(name), "X", name, type)) ||
- contains (items, `item(`id(name), "", name, type)));
+ define boolean has_resource (string name, string type) {
+ string translated = type2string [type]:type;
+ return (contains (items, `item(`id(name), "X", name, translated)) ||
+ contains (items, `item(`id(name), "", name, translated)));
}
/**
* helper function for building table items of one resource group
@@ -207,7 +213,8 @@
`VSpacing(0.2),
`Table(`id(`resources), `opt (`notify),
`header(
- " ",
+ // Header of the table with resources of one group 1/3
+ _("Active"),
// Header of the table with resources of one group 2/3
_("Name"),
// Header of the table with resources of one group 3/3
@@ -301,23 +308,45 @@
if (ret == `adds_b)
{
string service = GetService ();
- if (service != "" && !has_resource (service,"service"))
+ if (service != "")
{
- y2debug ("new service %1 for group %2", service, groupname);
- items = add (items, `item(`id(service), "", service,"service"));
- user_defined [service] = true;
- UI::ChangeWidget(`id(`resources), `Items, items);
+ if (has_resource (service,"service"))
+ {
+ // message popup
+ Popup::Message (sformat (_("Service
+%1
+is already present in this resource group."), service));
+ }
+ else
+ {
+ y2debug ("new service %1 for group %2", service, groupname);
+ items = add (items, `item(`id(service), "", service,
+ type2string["service"]:"service"));
+ user_defined [service] = true;
+ UI::ChangeWidget(`id(`resources), `Items, items);
+ }
}
}
if (ret == `addf_b)
{
string file = GetFile ();
- if (file != "" && !has_resource (file,"file"))
+ if (file != "")
{
- y2debug ("new file %1 for group %2", file, groupname);
- items = add (items, `item(`id(file), "", file, "file"));
- user_defined [file] = true;
- UI::ChangeWidget(`id(`resources), `Items, items);
+ if (has_resource (file, "file"))
+ {
+ // message popup
+ Popup::Message (sformat (_("File
+%1
+is already present in this resource group."), file));
+ }
+ else
+ {
+ y2debug ("new file %1 for group %2", file, groupname);
+ items = add (items, `item(`id(file), "", file,
+ type2string["file"]:"file"));
+ user_defined [file] = true;
+ UI::ChangeWidget(`id(`resources), `Items, items);
+ }
}
}
if (ret == `ok)
@@ -358,7 +387,7 @@
return $[
"active" : i[1]:"" == "X",
"name" : i[2]:"",
- "type" : i[3]:"",
+ "type" : string2type[i[3]:""]:(i[3]:""),
"user_defined" : user_defined [ i[2]:""]:false
];
});
@@ -469,7 +498,8 @@
`VSpacing(0.2),
`Table(`id(`rgroups), `opt (`notify),
`header(
- " ",
+ // Header of the table with resource groups 1/3
+ _("Active"),
// Header of the table with resource groups 2/3
_("Name"),
// Header of the table with resource groups 3/3
@@ -563,7 +593,8 @@
list<string> missing_files = [];
foreach (map res, group["resources"]:[], {
string name = res["name"]:"";
- if (res["type"]:"" == "file" && !FileUtils::Exists (name))
+ if (res["type"]:"" == "file" && res["active"]:false &&
+ !FileUtils::Exists (name))
missing_files = add (missing_files, res["name"]:"");
});
if (missing_files != [] && !Popup::AnyQuestionRichText (Popup::NoHeadline (),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.15.0/src/ProfileManager.ycp new/yast2-profile-manager-2.16.0/src/ProfileManager.ycp
--- old/yast2-profile-manager-2.15.0/src/ProfileManager.ycp 2007-06-11 15:33:52.000000000 +0200
+++ new/yast2-profile-manager-2.16.0/src/ProfileManager.ycp 2007-11-06 11:09:33.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of profile-manager, input and output funcs.
* Authors: Jiri Suchomel
*
- * $Id: ProfileManager.ycp 28122 2006-02-17 14:49:47Z jsuchome $
+ * $Id: ProfileManager.ycp 38405 2007-06-12 11:31:28Z jsuchome $
*
* Representation of the configuration of profile-manager.
* Input and output routines.
@@ -511,7 +511,7 @@
*/
global define boolean ReadConfigFile () ``{
- if (! FileUtils::Exists ("/etc/scpm.conf"))
+ if (! FileUtils::Exists ("/etc/sysconfig/scpm"))
return false;
scpm_conf = $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-profile-manager-2.15.0/VERSION new/yast2-profile-manager-2.16.0/VERSION
--- old/yast2-profile-manager-2.15.0/VERSION 2007-06-12 13:22:26.000000000 +0200
+++ new/yast2-profile-manager-2.16.0/VERSION 2007-11-06 11:17:41.000000000 +0100
@@ -1 +1 @@
-2.15.0
+2.16.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
