January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60284 - in /branches/tmp/bubli/libyui: Makefile.am SUBDIRS libyui.spec.in package/libyui-rpmlintrc package/libyui.changes package/yast2-libyui-rpmlintrc package/yast2-libyui.changes
by mvidner＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: mvidner Date: Fri Jan 8 10:11:22 2010 New Revision: 60284 URL: http://svn.opensuse.org/viewcvs/yast?rev=60284&view=rev Log: Build fixes: renamed rpmlintrc and changes. Included RPMNAME, VERSION in the tarball. Removed the now unnecessary BuildRequire of yast-devtools. Added: branches/tmp/bubli/libyui/package/libyui-rpmlintrc - copied unchanged from r60283, branches/tmp/bubli/libyui/package/yast2-libyui-rpmlintrc branches/tmp/bubli/libyui/package/libyui.changes - copied unchanged from r60283, branches/tmp/bubli/libyui/package/yast2-libyui.changes Removed: branches/tmp/bubli/libyui/SUBDIRS branches/tmp/bubli/libyui/package/yast2-libyui-rpmlintrc branches/tmp/bubli/libyui/package/yast2-libyui.changes Modified: branches/tmp/bubli/libyui/Makefile.am branches/tmp/bubli/libyui/libyui.spec.in Modified: branches/tmp/bubli/libyui/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/Makefile.am?… ============================================================================== --- branches/tmp/bubli/libyui/Makefile.am (original) +++ branches/tmp/bubli/libyui/Makefile.am Fri Jan 8 10:11:22 2010 @@ -11,7 +11,7 @@ pkgconfig_DATA = libyui.pc -EXTRA_DIST = $(RPMNAME).pc.in +EXTRA_DIST = MAINTAINER RPMNAME VERSION $(RPMNAME).pc.in $(RPMNAME)-$(VERSION).tar.bz2: dist-bzip2 Modified: branches/tmp/bubli/libyui/libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/libyui.spec.… ============================================================================== --- branches/tmp/bubli/libyui/libyui.spec.in (original) +++ branches/tmp/bubli/libyui/libyui.spec.in Fri Jan 8 10:11:22 2010 @@ -12,7 +12,6 @@ Source1: libyui-rpmlintrc BuildRequires: gcc-c++ -BuildRequires: yast2-devtools # autodocs + docbook docs BuildRequires: doxygen -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60283 - in /trunk/packager: package/ src/modules/ testsuite/tests/
by lslezak＠svn.opensuse.org 08 Jan '10

08 Jan '10

Author: lslezak Date: Fri Jan 8 09:09:30 2010 New Revision: 60283 URL: http://svn.opensuse.org/viewcvs/yast?rev=60283&view=rev Log: - don't display exact total remaining time when there is an overflow (i.e. for >2:00:00 and e.g. 15:20 remaining time display >2:00:00 total instead of 2:15:20) (bnc#567966) Added: trunk/packager/testsuite/tests/PackageSlideShow.err trunk/packager/testsuite/tests/PackageSlideShow.out trunk/packager/testsuite/tests/PackageSlideShow.ycp Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageSlideShow.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Jan 8 09:09:30 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 8 08:05:12 UTC 2010 - lslezak(a)suse.cz + +- don't display exact total remaining time when there is an + overflow (i.e. for >2:00:00 and e.g. 15:20 remaining time display + >2:00:00 total instead of 2:15:20) (bnc#567966) + +------------------------------------------------------------------- Thu Jan 7 12:16:03 UTC 2010 - lslezak(a)suse.cz - pass the selected CD/DVD device to the package manager in case Modified: trunk/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageSlid… ============================================================================== --- trunk/packager/src/modules/PackageSlideShow.ycp (original) +++ trunk/packager/src/modules/PackageSlideShow.ycp Fri Jan 8 09:09:30 2010 @@ -170,15 +170,15 @@ return sum; } - /** * Sum up all positive list items, but cut off individual items at a maximum value. * Negative return values indicate overflow of any individual item at "max_cutoff". - * In this case, the real sum is the absolute value of the return value. + * In this case, the absolute value of the return value is "max_cutoff" * number of overflows. + * (e.g. >2hour + >2hours + 1:13:20 => >4hours **/ integer ListSumCutOff( list<integer> sizes, integer max_cutoff ) { - boolean overflow = false; + integer overflow = 0; integer sum = 0; foreach( integer item, sizes, ``{ @@ -186,16 +186,19 @@ { if ( item > max_cutoff ) { - overflow = true; - sum = sum + max_cutoff; + overflow = overflow + 1; } else + { sum = sum + item; + } } }); - if ( overflow ) - sum = -sum; + if (overflow > 0) + { + sum = -overflow * max_cutoff; + } return sum; } Added: trunk/packager/testsuite/tests/PackageSlideShow.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/testsuite/tests/Package… ============================================================================== (empty) Added: trunk/packager/testsuite/tests/PackageSlideShow.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/testsuite/tests/Package… ============================================================================== --- trunk/packager/testsuite/tests/PackageSlideShow.out (added) +++ trunk/packager/testsuite/tests/PackageSlideShow.out Fri Jan 8 09:09:30 2010 @@ -0,0 +1,4 @@ +Read .target.tmpdir "/tmp" +Return 210 +Return -100 +Return -300 Added: trunk/packager/testsuite/tests/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/testsuite/tests/Package… ============================================================================== --- trunk/packager/testsuite/tests/PackageSlideShow.ycp (added) +++ trunk/packager/testsuite/tests/PackageSlideShow.ycp Fri Jan 8 09:09:30 2010 @@ -0,0 +1,27 @@ +/** + * Testsuite for PackageSlideShow.ycp module + * + * $Id:$ + */ + +{ + +include "testsuite.ycp"; +map READ = $[ + "target" : $[ + "tmpdir" : "/tmp" + ] +]; +TESTSUITE_INIT ([READ], nil); + +import "PackageSlideShow"; + +// no cut off +TEST(``(PackageSlideShow::ListSumCutOff([60, 70, 80, 0], 100)), [], nil); + +// one cut off +TEST(``(PackageSlideShow::ListSumCutOff([60, 70, 80, 150], 100)), [], nil); + +// more cut offs +TEST(``(PackageSlideShow::ListSumCutOff([160, 170, 180, 10], 100)), [], nil); +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60282 - in /branches/tmp/bubli/libyui: examples/Makefile.am libyui.spec.in
by kmachalkova＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: kmachalkova Date: Thu Jan 7 19:21:01 2010 New Revision: 60282 URL: http://svn.opensuse.org/viewcvs/yast?rev=60282&view=rev Log: Package C++ examples Modified: branches/tmp/bubli/libyui/examples/Makefile.am branches/tmp/bubli/libyui/libyui.spec.in Modified: branches/tmp/bubli/libyui/examples/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/examples/Mak… ============================================================================== --- branches/tmp/bubli/libyui/examples/Makefile.am (original) +++ branches/tmp/bubli/libyui/examples/Makefile.am Thu Jan 7 19:21:01 2010 @@ -4,9 +4,11 @@ INCLUDES = -I$(top_srcdir)/src/ -doc_DATA = HelloWorld.cc \ - ComboBox1.cc \ - SelectionBox1.cc +examplesdir = $(docdir)/examples + +examples_DATA = $(wildcard *.cc) + +EXTRA_DIST = $(examples_DATA) noinst_PROGRAMS = \ HelloWorld \ Modified: branches/tmp/bubli/libyui/libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/libyui.spec.… ============================================================================== --- branches/tmp/bubli/libyui/libyui.spec.in (original) +++ branches/tmp/bubli/libyui/libyui.spec.in Thu Jan 7 19:21:01 2010 @@ -93,4 +93,4 @@ %dir %{_datadir}/cmake %dir %{_datadir}/cmake/Modules %{_datadir}/cmake/Modules/* -%doc %{_prefix}/share/doc/packages/libyui/* +%doc %{_prefix}/share/doc/packages/libyui/examples -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60281 - /branches/tmp/bubli/libyui/libyui.spec.in
by kmachalkova＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: kmachalkova Date: Thu Jan 7 18:54:35 2010 New Revision: 60281 URL: http://svn.opensuse.org/viewcvs/yast?rev=60281&view=rev Log: Some polishing of .spec proposed by prusnak Modified: branches/tmp/bubli/libyui/libyui.spec.in Modified: branches/tmp/bubli/libyui/libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/libyui.spec.… ============================================================================== --- branches/tmp/bubli/libyui/libyui.spec.in (original) +++ branches/tmp/bubli/libyui/libyui.spec.in Thu Jan 7 18:54:35 2010 @@ -24,7 +24,6 @@ BuildRequires: boost-devel Summary: YaST2 - User Interface Engine -Provides: %{_libdir}/libyui.so.3.0.0 %description This is the YaST2 user interface engine that provides the abstraction @@ -75,11 +74,9 @@ %clean rm -rf "$RPM_BUILD_ROOT" -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60280 - in /branches/tmp/bubli/libyui: Makefile.am Makefile.cvs RPMNAME configure.in configure.in.in examples/Makefile.am libyui.pc.in libyui.spec.in yast2-libyui.pc.in yast2-libyui.spec.in
by kmachalkova＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: kmachalkova Date: Thu Jan 7 18:45:17 2010 New Revision: 60280 URL: http://svn.opensuse.org/viewcvs/yast?rev=60280&view=rev Log: Files in, files out Added: branches/tmp/bubli/libyui/Makefile.am branches/tmp/bubli/libyui/configure.in branches/tmp/bubli/libyui/libyui.pc.in - copied unchanged from r60279, branches/tmp/bubli/libyui/yast2-libyui.pc.in branches/tmp/bubli/libyui/libyui.spec.in Removed: branches/tmp/bubli/libyui/configure.in.in branches/tmp/bubli/libyui/yast2-libyui.pc.in branches/tmp/bubli/libyui/yast2-libyui.spec.in Modified: branches/tmp/bubli/libyui/Makefile.cvs branches/tmp/bubli/libyui/RPMNAME branches/tmp/bubli/libyui/examples/Makefile.am Added: branches/tmp/bubli/libyui/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/Makefile.am?… ============================================================================== --- branches/tmp/bubli/libyui/Makefile.am (added) +++ branches/tmp/bubli/libyui/Makefile.am Thu Jan 7 18:45:17 2010 @@ -0,0 +1,25 @@ +# +# Makefile.am for libyui +# + +SUBDIRS = src cmake examples + +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip + +$(RPMNAME).pc: $(RPMNAME).pc.in config.status + ./config.status --file=$@:$< + +pkgconfig_DATA = libyui.pc + +EXTRA_DIST = $(RPMNAME).pc.in + + +$(RPMNAME)-$(VERSION).tar.bz2: dist-bzip2 + +package-local: $(RPMNAME)-$(VERSION).tar.bz2 + rm -f package/$(RPMNAME)-*.tar.bz2 + rm -f package/*~ + rm -f package/*.bak + mv $(RPMNAME)-$(VERSION).tar.bz2 package/ + +package: package-local Modified: branches/tmp/bubli/libyui/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/Makefile.cvs… ============================================================================== --- branches/tmp/bubli/libyui/Makefile.cvs (original) +++ branches/tmp/bubli/libyui/Makefile.cvs Thu Jan 7 18:45:17 2010 @@ -2,17 +2,18 @@ # Makefile.cvs # -LIB = $(shell y2tool get-lib) +#LIB = $(shell y2tool get-lib) PREFIX = /usr configure: all - ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + ./configure --prefix=$(PREFIX) all: - y2tool y2autoconf - y2tool y2automake - autoreconf --force --install -v + aclocal + autoconf + autoheader + autoreconf --force --install install: configure make Modified: branches/tmp/bubli/libyui/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/RPMNAME?rev=… ============================================================================== --- branches/tmp/bubli/libyui/RPMNAME (original) +++ branches/tmp/bubli/libyui/RPMNAME Thu Jan 7 18:45:17 2010 @@ -1 +1 @@ -yast2-libyui +libyui Added: branches/tmp/bubli/libyui/configure.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/configure.in… ============================================================================== --- branches/tmp/bubli/libyui/configure.in (added) +++ branches/tmp/bubli/libyui/configure.in Thu Jan 7 18:45:17 2010 @@ -0,0 +1,38 @@ +AC_INIT(src/YUI.h) + +VERSION=`cat ./VERSION` +RPMNAME=`cat ./RPMNAME` + +AM_INIT_AUTOMAKE(libyui, $VERSION) +AM_CONFIG_HEADER(config.h) + +AC_DISABLE_STATIC + +AC_PROG_CXX +AC_PROG_LIBTOOL +AM_PROG_LIBTOOL + +AC_PREFIX_DEFAULT(/usr) + +CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" + +CXXFLAGS="${CXXFLAGS} -std=gnu++0x -DHAVE_CXX0X -Wall -Wformat=2 -Wnon-virtual-dtor" + +docdir=\${prefix}/share/doc/packages/libyui +includedir=\${prefix}/include/YaST2 +pkgconfigdir=\${libdir}/pkgconfig + +AC_SUBST(VERSION) +AC_SUBST(RPMNAME) +AC_SUBST(docdir) +AC_SUBST(includedir) +AC_SUBST(pkgconfigdir) + +AC_OUTPUT( + Makefile + src/Makefile + cmake/Makefile + examples/Makefile + package/libyui.spec:libyui.spec.in + libyui.pc:libyui.pc.in +) Modified: branches/tmp/bubli/libyui/examples/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/examples/Mak… ============================================================================== --- branches/tmp/bubli/libyui/examples/Makefile.am (original) +++ branches/tmp/bubli/libyui/examples/Makefile.am Thu Jan 7 18:45:17 2010 @@ -4,6 +4,10 @@ INCLUDES = -I$(top_srcdir)/src/ +doc_DATA = HelloWorld.cc \ + ComboBox1.cc \ + SelectionBox1.cc + noinst_PROGRAMS = \ HelloWorld \ ComboBox1 \ Added: branches/tmp/bubli/libyui/libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/libyui.spec.… ============================================================================== --- branches/tmp/bubli/libyui/libyui.spec.in (added) +++ branches/tmp/bubli/libyui/libyui.spec.in Thu Jan 7 18:45:17 2010 @@ -0,0 +1,99 @@ +# +# spec file for package libyui (Version @VERSION@) +# +# norootforbuild + +Name: libyui +Version: @VERSION@ +Release: 0 +License: GPL v2 or later +Group: System/Libraries +Source: libyui-%{version}.tar.bz2 +Source1: libyui-rpmlintrc + +BuildRequires: gcc-c++ +BuildRequires: yast2-devtools + +# autodocs + docbook docs +BuildRequires: doxygen +BuildRequires: docbook-xsl-stylesheets libxslt +BuildRequires: sgml-skel +Conflicts: yast2-core < 2.16.38 + +# libyui ImplPtr +BuildRequires: boost-devel + +Summary: YaST2 - User Interface Engine +Provides: %{_libdir}/libyui.so.3.0.0 + +%description +This is the YaST2 user interface engine that provides the abstraction +from graphical user interfaces (Qt, Gtk) and text based user interfaces +(ncurses). + +This can be used independently of YaST2 for generic (C++) applications. +This package has very few dependencies. + +%package devel +Summary: YaST2 - User Interface Engine header filews + +Requires: glibc-devel +Requires: libstdc++-devel +Requires: boost-devel + +%description devel +This is the development package for the YaST2 user interface engine +that provides the abstraction from graphical user interfaces (Qt, Gtk) +and text based user interfaces (ncurses). + +This can be used independently of YaST2 for generic (C++) applications. +This package has very few dependencies. + +%prep +%setup -n %{name}-%{version} + +%build + +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + +aclocal +libtoolize --force --automake --copy +autoheader +automake --add-missing --copy +autoconf +%{?suse_update_config:%{suse_update_config -f}} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} +make %{?jobs:-j%jobs} + +%install +make install DESTDIR="$RPM_BUILD_ROOT" + +mkdir -p "$RPM_BUILD_ROOT"%{_vardir}/log/YaST2 +%perl_process_packlist + +%clean +rm -rf "$RPM_BUILD_ROOT" + +%post +%run_ldconfig + +%postun +%run_ldconfig + +%files +%defattr(-,root,root) + +%{_libdir}/lib*.so.* +%dir %doc %{_prefix}/share/doc/packages/libyui/ + +%files devel +%defattr(-,root,root) +%{_libdir}/lib*.so +%{_libdir}/lib*.la +%{_prefix}/include/YaST2 +%{_libdir}/pkgconfig/libyui.pc +%dir %{_datadir}/cmake +%dir %{_datadir}/cmake/Modules +%{_datadir}/cmake/Modules/* +%doc %{_prefix}/share/doc/packages/libyui/* -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60279 - /branches/tmp/bubli/libyui/
by kmachalkova＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: kmachalkova Date: Thu Jan 7 16:20:08 2010 New Revision: 60279 URL: http://svn.opensuse.org/viewcvs/yast?rev=60279&view=rev Log: De-yastification of libyui Added: branches/tmp/bubli/libyui/ - copied from r60278, trunk/libyui/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60278 - in /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src: MdCo.cc MdCo.h MdPartCo.cc MdPartCo.h Storage.cc Storage.h
by mpatelcz＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: mpatelcz Date: Thu Jan 7 16:10:03 2010 New Revision: 60278 URL: http://svn.opensuse.org/viewcvs/yast?rev=60278&view=rev Log: Bug 567662 - wrong number for new software raid Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.cc Thu Jan 7 16:10:03 2010 @@ -277,6 +277,19 @@ return( i ); } +int +MdCo::usedNumbers(list<int>& nums) +{ + MdPair p=mdPair(Md::notDeleted); + MdIter i; + nums.clear(); + for(i=p.begin(); i!=p.end(); i++ ) + { + nums.push_back(i->nr()); + } + return 0; +} + int MdCo::createMd( unsigned num, MdType type, const list<string>& devs ) { Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdCo.h Thu Jan 7 16:10:03 2010 @@ -56,6 +56,10 @@ bool equalContent( const Container& rhs ) const; void logDifference( const Container& d ) const; + /* This function is deprecated and should not be used. + * It returns first free 'md' number for Non-partitionable MD RAIDs + * Regardless from Partitionable RAIDs and this can lead to errors. + */ unsigned unusedNumber(); void syncRaidtab(); void changeDeviceName( const string& old, const string& nw ); @@ -63,6 +67,9 @@ static void activate( bool val, const string& tmpDir ); int removeVolume( Volume* v ); + /* returns in 'nums' numbers that are used by Md */ + int usedNumbers(list<int>& nums); + protected: // iterators over MD volumes // protected typedefs for iterators over MD volumes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Thu Jan 7 16:10:03 2010 @@ -502,6 +502,11 @@ return n; } +int MdPartCo::nr() +{ + return mnr; +} + // // Assumption is that we're using /dev not /dev/md Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Thu Jan 7 16:10:03 2010 @@ -131,7 +131,10 @@ void syncRaidtab(); + /* Returns number from MD name */ int nr(const string& name); + /* Returns Md number. */ + int nr(); /* RAID Related functionality */ unsigned long chunkSize() const { return chunk_size; } Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Thu Jan 7 16:10:03 2010 @@ -3382,14 +3382,87 @@ int ret = 0; assertInit(); MdCo *md = NULL; - nr = 0; + list<int> mdNums; + list<int> mdPartNums; + + nr = -1; + mdNums.clear(); + mdPartNums.clear(); if (haveMd(md)) - nr = md->unusedNumber(); - device = "/dev/md" + decString(nr); - y2milestone("ret:%d nr:%d device:%s", ret, nr, device.c_str()); + (void)md->usedNumbers(mdNums); + + getMdPartMdNums(mdPartNums); + + mdPartNums.merge(mdNums); + mdPartNums.sort(); + mdPartNums.unique(); + + if(mdPartNums.size() > 0 ) + { + int found; + //FIXME: magic number + for(int i=0; i<1000; i++) + { + found=0; + for(list<int>::iterator it=mdPartNums.begin(); + it!=mdPartNums.end(); it++) + { + if (i == *it ) + found = 1; + } + if(found == 0) + { + // Number not found on the list. + nr = i; + break; + } + } + } + else + { + nr = 0; + } + if( nr != -1 ) + { + device = "/dev/md" + decString(nr); + y2milestone("ret:%d nr:%d device:%s", ret, nr, device.c_str()); + } + else + ret = MD_UNKNOWN_NUMBER; return ret; } +bool Storage::checkMdNumber(int num) +{ + assertInit(); + MdCo *md = NULL; + list<int> mdNums; + list<int> mdPartNums; + + mdNums.clear(); + mdPartNums.clear(); + if (haveMd(md)) + (void)md->usedNumbers(mdNums); + + getMdPartMdNums(mdPartNums); + + mdPartNums.merge(mdNums); + mdPartNums.sort(); + mdPartNums.unique(); + + if(mdPartNums.size() == 0 ) + return false; + + for(list<int>::iterator it=mdPartNums.begin(); + it!=mdPartNums.end(); + it++) + { + if (num == *it ) + return true; + } + return false; +} + int Storage::createMd( const string& name, MdType rtype, const deque<string>& devs ) @@ -3407,6 +3480,10 @@ { ret = STORAGE_MD_INVALID_NAME; } + if( ret==0 && checkMdNumber(num)==true ) + { + ret = MD_DUPLICATE_NUMBER; + } MdCo *md = NULL; bool have_md = true; if( ret==0 ) @@ -3450,16 +3527,22 @@ } MdCo *md = NULL; bool have_md = true; + int mdNum=0; unsigned num = 0; + string tmpStr; if( ret==0 ) { have_md = haveMd(md); if( !have_md ) md = new MdCo( this, false ); - else - num = md->unusedNumber(); if( md==NULL ) ret = STORAGE_MEMORY_EXHAUSTED; + if( ret == 0 ) + { + ret = nextFreeMd(mdNum,tmpStr); + if( ret == 0 ) + num = (unsigned)mdNum; + } } if( ret==0 ) { @@ -3795,6 +3878,21 @@ return( i != p.end() ); } +int Storage::getMdPartMdNums(list<int>& mdPartNums) + { + mdPartNums.clear(); + CPair p = cPair(); + ContIterator i; + for(i=p.begin(); i!=p.end(); i++ ) + { + if( i->type()==MDPART ) + { + MdPartCo *mdpart = static_cast<MdPartCo*>(&(*i)); + mdPartNums.push_back(mdpart->nr()); + } + } + return 0; + } bool Storage::haveDm(DmCo*& dm) @@ -5840,7 +5938,7 @@ break; case UB_MDPART: y2war(device << " used by MD PART"); - // ret = removeMdPartCo( name ); + //ret = removeMdPartCo( uby.device() ); break; case UB_DMMULTIPATH: break; Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h Thu Jan 7 16:10:03 2010 @@ -460,6 +460,7 @@ LvmLvSnapshotStateInfo& info); int nextFreeMd(int &nr, string &device); + bool checkMdNumber(int num); int createMd( const string& name, storage::MdType rtype, const deque<string>& devs ); int createMdAny( storage::MdType rtype, const deque<string>& devs, @@ -1880,6 +1881,7 @@ void checkPwdBuf( const string& device ); bool haveMd( MdCo*& md ); + int getMdPartMdNums(list<int>& mdPartNums); bool haveDm(DmCo*& dm); bool haveNfs( NfsCo*& co ); bool haveLoop( LoopCo*& loop ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60277 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_complex_welcome.ycp
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:29:32 2010 New Revision: 60277 URL: http://svn.opensuse.org/viewcvs/yast?rev=60277&view=rev Log: - inst_complex_welcome adapted to Language::SwitchToEnglishIfNeeded (bnc#479529) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_complex_welcome.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jan 7 15:29:32 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 7 15:29:13 CET 2010 - jsuchome(a)suse.cz + +- inst_complex_welcome adapted to Language::SwitchToEnglishIfNeeded + (bnc#479529) + +------------------------------------------------------------------- Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz - Adapted for new API to ProductLicense (FATE #306295). Modified: trunk/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_co… ============================================================================== --- trunk/installation/src/clients/inst_complex_welcome.ycp (original) +++ trunk/installation/src/clients/inst_complex_welcome.ycp Thu Jan 7 15:29:32 2010 @@ -242,16 +242,12 @@ } // Check and set CJK languages if (Stage::initial () || Stage::firstboot ()) { - if (ret == `language && - Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && - Language::GetTextMode ()) { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - - Language::WfmSetGivenLanguage ("en_US"); - } else if (ret == `language) { + if (ret == `language && Language::SwitchToEnglishIfNeeded (true)) + { + y2debug ("UI switched to en_US"); + } + else if (ret == `language) + { Console::SelectFont (language); // no yast translation for nn_NO, use nb_NO as a backup if (language == "nn_NO") -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60276 - in /branches/SuSE-Code-11-SP1-Branch/installation: package/yast2-installation.changes src/clients/inst_complex_welcome.ycp
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:29:14 2010 New Revision: 60276 URL: http://svn.opensuse.org/viewcvs/yast?rev=60276&view=rev Log: - inst_complex_welcome adapted to Language::SwitchToEnglishIfNeeded (bnc#479529) Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Thu Jan 7 15:29:14 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 7 15:28:48 CET 2010 - jsuchome(a)suse.cz + +- inst_complex_welcome adapted to Language::SwitchToEnglishIfNeeded + (bnc#479529) + +------------------------------------------------------------------- Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz - Adapted for new API to ProductLicense (FATE #306295). Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp Thu Jan 7 15:29:14 2010 @@ -242,16 +242,12 @@ } // Check and set CJK languages if (Stage::initial () || Stage::firstboot ()) { - if (ret == `language && - Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && - Language::GetTextMode ()) { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - - Language::WfmSetGivenLanguage ("en_US"); - } else if (ret == `language) { + if (ret == `language && Language::SwitchToEnglishIfNeeded (true)) + { + y2debug ("UI switched to en_US"); + } + else if (ret == `language) + { Console::SelectFont (language); // no yast translation for nn_NO, use nb_NO as a backup if (language == "nn_NO") -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60275 - /tags/stable-2_19_1/firstboot/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:28:05 2010 New Revision: 60275 URL: http://svn.opensuse.org/viewcvs/yast?rev=60275&view=rev Log: Created tag stable-2_19_1 for firstboot Added: tags/stable-2_19_1/firstboot/ - copied from r60274, trunk/firstboot/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60274 - in /trunk/firstboot: ./ doc/ package/ src/ src/control/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:27:42 2010 New Revision: 60274 URL: http://svn.opensuse.org/viewcvs/yast?rev=60274&view=rev Log: - added firstboot_licenses step able to show 2 license texts (fate#306295) - adapt to Language::SwitchToEnglishIfNeeded (bnc#479529) - 2.19.1 Added: trunk/firstboot/src/firstboot_licenses.ycp (with props) Modified: trunk/firstboot/VERSION trunk/firstboot/doc/firstboot-section_mod.xml trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/Makefile.am trunk/firstboot/src/control/firstboot.xml trunk/firstboot/src/firstboot_language_keyboard.ycp trunk/firstboot/yast2-firstboot.spec.in Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=60274&r1=6… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Thu Jan 7 15:27:42 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/firstboot/doc/firstboot-section_mod.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/doc/firstboot-section_… ============================================================================== --- trunk/firstboot/doc/firstboot-section_mod.xml (original) +++ trunk/firstboot/doc/firstboot-section_mod.xml Thu Jan 7 15:27:42 2010 @@ -143,6 +143,10 @@ </para> <para> + To show two license texts in one dialog (typically the one from vendor and one from Novell), use 'firstboot_license_novell' step in your firstboot.xml file. This client will use the license texts specified by both FIRSTBOOT_LICENSE_DIR and FIRSTBOOT_NOVELL_LICENSE_DIR. + </para> + + <para> If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_finish. The recommended way of customizing the congratulate text is specifying it in the firstboot.xml control file. </para> Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Thu Jan 7 15:27:42 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 7 14:34:43 CET 2010 - jsuchome(a)suse.cz + +- added firstboot_licenses step able to show 2 license texts + (fate#306295) +- adapt to Language::SwitchToEnglishIfNeeded (bnc#479529) +- 2.19.1 + +------------------------------------------------------------------- Tue Dec 22 13:04:01 CET 2009 - jsuchome(a)suse.cz - handle arguments from control file (bnc#566669) Modified: trunk/firstboot/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/Makefile.am?rev=60… ============================================================================== --- trunk/firstboot/src/Makefile.am (original) +++ trunk/firstboot/src/Makefile.am Thu Jan 7 15:27:42 2010 @@ -11,6 +11,7 @@ firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ + firstboot_licenses.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ firstboot_keyboard.ycp \ Modified: trunk/firstboot/src/control/firstboot.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/control/firstboot.… ============================================================================== --- trunk/firstboot/src/control/firstboot.xml (original) +++ trunk/firstboot/src/control/firstboot.xml Thu Jan 7 15:27:42 2010 @@ -104,6 +104,11 @@ <name>firstboot_welcome</name> </module> <module> + <label>License Agreements</label> + <enabled config:type="boolean">false</enabled> + <name>firstboot_licenses</name> + </module> + <module> <label>License Agreement</label> <enabled config:type="boolean">true</enabled> <name>firstboot_license_novell</name> Modified: trunk/firstboot/src/firstboot_language_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_language… ============================================================================== --- trunk/firstboot/src/firstboot_language_keyboard.ycp (original) +++ trunk/firstboot/src/firstboot_language_keyboard.ycp Thu Jan 7 15:27:42 2010 @@ -137,13 +137,9 @@ Language::Set (language); } // Check and set CJK languages - if (ret == `language && Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && Language::GetTextMode ()) + if (ret == `language && Language::SwitchToEnglishIfNeeded (true)) { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - Language::WfmSetGivenLanguage ("en_US"); + y2debug ("UI switched to en_US"); } else if (ret == `language) { Added: trunk/firstboot/src/firstboot_licenses.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_licenses… ============================================================================== --- trunk/firstboot/src/firstboot_licenses.ycp (added) +++ trunk/firstboot/src/firstboot_licenses.ycp Thu Jan 7 15:27:42 2010 @@ -0,0 +1,49 @@ +/* + * Purpose : Display 2 license texts (probably from vendor and Novell) during firstboot configuration + * + * $Id$ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + import "ProductFeatures"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + + // default directory with Novell license texts + string default_dir = ProductFeatures::GetStringFeature ("globals", + "base_product_license_directory"); + + string dir1 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_LICENSE_DIR, "/etc/YaST2"); + string dir2 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, default_dir); + + if (dir2 != dir1) + args["directories"] = [ dir1, dir2]; + else + args["directories"] = [ dir1 ]; + + args["action"] = Misc::SysconfigRead ( + .sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + y2milestone("inst_license options: %1", args); + + result = WFM::CallFunction( "inst_license", [ args ] ); + + if (result == `halt) + { + UI::CloseDialog(); + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + + return result; + +} Modified: trunk/firstboot/yast2-firstboot.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/yast2-firstboot.spec.i… ============================================================================== --- trunk/firstboot/yast2-firstboot.spec.in (original) +++ trunk/firstboot/yast2-firstboot.spec.in Thu Jan 7 15:27:42 2010 @@ -13,10 +13,10 @@ # yast2/NeworkDevices -> yast2/NetworkInterfaces Requires: yast2 >= 2.16.23 Requires: yast2-bootloader -# Keyboard::Write (), bnc#441404 -Requires: yast2-country >= 2.18.14 -# Installation startup scripts -Requires: yast2-installation +# Language::SwitchToEnglishIfNeeded +Requires: yast2-country >= 2.19.5 +# new version of inst_license +Requires: yast2-installation >= 2.19.0 BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60273 - /tags/branch-Code-11-SP1-2_17_12/firstboot/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:22:43 2010 New Revision: 60273 URL: http://svn.opensuse.org/viewcvs/yast?rev=60273&view=rev Log: Created tag branch-Code-11-SP1-2_17_12 for firstboot Added: tags/branch-Code-11-SP1-2_17_12/firstboot/ (props changed) - copied from r60272, branches/SuSE-Code-11-SP1-Branch/firstboot/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60272 - in /branches/SuSE-Code-11-SP1-Branch/firstboot: ./ doc/ package/ src/ src/control/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:22:36 2010 New Revision: 60272 URL: http://svn.opensuse.org/viewcvs/yast?rev=60272&view=rev Log: - added firstboot_licenses step able to show 2 license texts (fate#306295) - adapt to Language::SwitchToEnglishIfNeeded (bnc#479529) - 2.17.12 Added: branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_licenses.ycp (with props) Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION branches/SuSE-Code-11-SP1-Branch/firstboot/doc/firstboot-section_mod.xml branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-Code-11-SP1-Branch/firstboot/src/Makefile.am branches/SuSE-Code-11-SP1-Branch/firstboot/src/control/firstboot.xml branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp branches/SuSE-Code-11-SP1-Branch/firstboot/yast2-firstboot.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION Thu Jan 7 15:22:36 2010 @@ -1 +1 @@ -2.17.11 +2.17.12 Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/doc/firstboot-section_mod.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/doc/firstboot-section_mod.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/doc/firstboot-section_mod.xml Thu Jan 7 15:22:36 2010 @@ -143,6 +143,10 @@ </para> <para> + To show two license texts in one dialog (typically the one from vendor and one from Novell), use 'firstboot_license_novell' step in your firstboot.xml file. This client will use the license texts specified by both FIRSTBOOT_LICENSE_DIR and FIRSTBOOT_NOVELL_LICENSE_DIR. + </para> + + <para> If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_finish. The recommended way of customizing the congratulate text is specifying it in the firstboot.xml control file. </para> Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes Thu Jan 7 15:22:36 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 7 15:12:05 CET 2010 - jsuchome(a)suse.cz + +- added firstboot_licenses step able to show 2 license texts + (fate#306295) +- adapt to Language::SwitchToEnglishIfNeeded (bnc#479529) +- 2.17.12 + +------------------------------------------------------------------- Tue Dec 22 13:04:44 CET 2009 - jsuchome(a)suse.cz - handle arguments from control file (bnc#566669) Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/Makefile.am Thu Jan 7 15:22:36 2010 @@ -11,6 +11,7 @@ firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ + firstboot_licenses.ycp \ firstboot_welcome.ycp \ firstboot_ssh.ycp \ firstboot_keyboard.ycp \ Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/src/control/firstboot.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/control/firstboot.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/control/firstboot.xml Thu Jan 7 15:22:36 2010 @@ -104,6 +104,11 @@ <name>firstboot_welcome</name> </module> <module> + <label>License Agreements</label> + <enabled config:type="boolean">false</enabled> + <name>firstboot_licenses</name> + </module> + <module> <label>License Agreement</label> <enabled config:type="boolean">true</enabled> <name>firstboot_license_novell</name> Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_language_keyboard.ycp Thu Jan 7 15:22:36 2010 @@ -137,13 +137,9 @@ Language::Set (language); } // Check and set CJK languages - if (ret == `language && Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && Language::GetTextMode ()) + if (ret == `language && Language::SwitchToEnglishIfNeeded (true)) { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - Language::WfmSetGivenLanguage ("en_US"); + y2debug ("UI switched to en_US"); } else if (ret == `language) { Added: branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_licenses.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_licenses.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_licenses.ycp Thu Jan 7 15:22:36 2010 @@ -0,0 +1,49 @@ +/* + * Purpose : Display 2 license texts (probably from vendor and Novell) during firstboot configuration + * + * $Id$ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + import "ProductFeatures"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + + // default directory with Novell license texts + string default_dir = ProductFeatures::GetStringFeature ("globals", + "base_product_license_directory"); + + string dir1 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_LICENSE_DIR, "/etc/YaST2"); + string dir2 = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, default_dir); + + if (dir2 != dir1) + args["directories"] = [ dir1, dir2]; + else + args["directories"] = [ dir1 ]; + + args["action"] = Misc::SysconfigRead ( + .sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + y2milestone("inst_license options: %1", args); + + result = WFM::CallFunction( "inst_license", [ args ] ); + + if (result == `halt) + { + UI::CloseDialog(); + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + + return result; + +} Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/yast2-firstboot.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/yast2-firstboot.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/yast2-firstboot.spec.in Thu Jan 7 15:22:36 2010 @@ -11,8 +11,8 @@ # yast2/NeworkDevices -> yast2/NetworkInterfaces Requires: yast2 >= 2.16.23 Requires: yast2-bootloader -# Language::PackagesCommit -Requires: yast2-country >= 2.17.37 +# Language::SwitchToEnglishIfNeeded +Requires: yast2-country >= 2.17.40 # Installation startup scripts Requires: yast2-installation -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60271 - /tags/stable-2_19_5/country/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:09:41 2010 New Revision: 60271 URL: http://svn.opensuse.org/viewcvs/yast?rev=60271&view=rev Log: Created tag stable-2_19_5 for country Added: tags/stable-2_19_5/country/ - copied from r60270, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60270 - in /trunk/country: VERSION language/src/modules/Language.ycp language/src/select_language.ycp package/yast2-country.changes
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:09:34 2010 New Revision: 60270 URL: http://svn.opensuse.org/viewcvs/yast?rev=60270&view=rev Log: - added Language::SwitchToEnglishIfNeeded to be called when it might be necessary to use English in UI, due to possible displaying problems with another language (bnc#479529) - 2.19.5 Modified: trunk/country/VERSION trunk/country/language/src/modules/Language.ycp trunk/country/language/src/select_language.ycp trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=60270&r1=602… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Jan 7 15:09:34 2010 @@ -1 +1 @@ -2.19.4 +2.19.5 Modified: trunk/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Lan… ============================================================================== --- trunk/country/language/src/modules/Language.ycp (original) +++ trunk/country/language/src/modules/Language.ycp Thu Jan 7 15:09:34 2010 @@ -134,7 +134,6 @@ return contains (cjk_languages, l); } - /** * return the value of text_mode (true for ncurses) */ @@ -1239,5 +1238,40 @@ } } +/** + * Set current YaST language to English if method for showing text in + * current language is not supported (usually for CJK languages) + * See http://bugzilla.novell.com/show_bug.cgi?id=479529 for discussion + * @boolean show_popup if information popup about the change should be shown + * @return true if UI language was changed + */ +global boolean SwitchToEnglishIfNeeded (boolean show_popup) { + + if (Stage::normal ()) + { + y2milestone ("no language switching in normal stage"); + return false; + } + if (GetTextMode () && + // current language is CJK + CJKLanguage (language) && + // fbiterm is not running + getenv ("TERM") != "iterm") + { + if (show_popup) + { + // popup message (user selected CJK language in text mode) + Popup::Message (_("The selected language cannot be used in text mode. English is used for +installation, but the selected language will be used for the new system.")); + } + WfmSetGivenLanguage ("en_US"); + return true; + } + return false; +} + + + + /* EOF */ } Modified: trunk/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/select_lang… ============================================================================== --- trunk/country/language/src/select_language.ycp (original) +++ trunk/country/language/src/select_language.ycp Thu Jan 7 15:09:34 2010 @@ -528,17 +528,10 @@ if (Stage::initial () || Stage::firstboot ()) { - if ((set_default && ret == `language || - (!set_default && ret == `next)) && - Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && - Language::GetTextMode ()) - { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - - Language::WfmSetGivenLanguage ("en_US"); + if ((set_default && ret == `language || (!set_default && ret == `next)) && + Language::SwitchToEnglishIfNeeded (true)) + { + y2debug ("UI switched to en_US"); } else if (ret == `next || (set_default && ret == `language)) { Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Jan 7 15:09:34 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 7 14:40:33 CET 2010 - jsuchome(a)suse.cz + +- added Language::SwitchToEnglishIfNeeded to be called when it might + be necessary to use English in UI, due to possible displaying + problems with another language (bnc#479529) +- 2.19.5 + +------------------------------------------------------------------- Mon Jan 4 10:47:25 CET 2010 - jsuchome(a)suse.cz - returned keyboard desktop file, adapted help text (bnc#560713) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60269 - /tags/branch-Code-11-SP1-2_17_40/country/
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:09:27 2010 New Revision: 60269 URL: http://svn.opensuse.org/viewcvs/yast?rev=60269&view=rev Log: Created tag branch-Code-11-SP1-2_17_40 for country Added: tags/branch-Code-11-SP1-2_17_40/country/ (props changed) - copied from r60268, branches/SuSE-Code-11-SP1-Branch/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60268 - in /branches/SuSE-Code-11-SP1-Branch/country: VERSION language/src/modules/Language.ycp language/src/select_language.ycp package/yast2-country.changes
by jsuchome＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsuchome Date: Thu Jan 7 15:09:21 2010 New Revision: 60268 URL: http://svn.opensuse.org/viewcvs/yast?rev=60268&view=rev Log: - added Language::SwitchToEnglishIfNeeded to be called when it might be necessary to use English in UI, due to possible displaying problems with another language (bnc#479529) - 2.17.40 Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp branches/SuSE-Code-11-SP1-Branch/country/language/src/select_language.ycp branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/country/VERSION Thu Jan 7 15:09:21 2010 @@ -1 +1 @@ -2.17.39 +2.17.40 Modified: branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/country/language/src/modules/Language.ycp Thu Jan 7 15:09:21 2010 @@ -134,7 +134,6 @@ return contains (cjk_languages, l); } - /** * return the value of text_mode (true for ncurses) */ @@ -1239,5 +1238,40 @@ } } +/** + * Set current YaST language to English if method for showing text in + * current language is not supported (usually for CJK languages) + * See http://bugzilla.novell.com/show_bug.cgi?id=479529 for discussion + * @boolean show_popup if information popup about the change should be shown + * @return true if UI language was changed + */ +global boolean SwitchToEnglishIfNeeded (boolean show_popup) { + + if (Stage::normal ()) + { + y2milestone ("no language switching in normal stage"); + return false; + } + if (GetTextMode () && + // current language is CJK + CJKLanguage (language) && + // fbiterm is not running + getenv ("TERM") != "iterm") + { + if (show_popup) + { + // popup message (user selected CJK language in text mode) + Popup::Message (_("The selected language cannot be used in text mode. English is used for +installation, but the selected language will be used for the new system.")); + } + WfmSetGivenLanguage ("en_US"); + return true; + } + return false; +} + + + + /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/language/src/select_language.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/country/language/src/select_language.ycp Thu Jan 7 15:09:21 2010 @@ -528,17 +528,10 @@ if (Stage::initial () || Stage::firstboot ()) { - if ((set_default && ret == `language || - (!set_default && ret == `next)) && - Language::CJKLanguage (language) && - !Language::CJKLanguage (preselected) && - Language::GetTextMode ()) - { - // popup message (user selected CJK language in text mode) - Popup::Message (_("The selected language cannot be used in text mode. English is used for -installation, but the selected language will be used for the new system.")); - - Language::WfmSetGivenLanguage ("en_US"); + if ((set_default && ret == `language || (!set_default && ret == `next)) && + Language::SwitchToEnglishIfNeeded (true)) + { + y2debug ("UI switched to en_US"); } else if (ret == `next || (set_default && ret == `language)) { Modified: branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/count… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Thu Jan 7 15:09:21 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 7 14:45:07 CET 2010 - jsuchome(a)suse.cz + +- added Language::SwitchToEnglishIfNeeded to be called when it might + be necessary to use English in UI, due to possible displaying + problems with another language (bnc#479529) +- 2.17.40 + +------------------------------------------------------------------- Fri Dec 4 14:12:20 CET 2009 - jsuchome(a)suse.cz - install ntp together with yast2-ntp-client (bnc#560732) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60267 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: aschnell Date: Thu Jan 7 14:39:06 2010 New Revision: 60267 URL: http://svn.opensuse.org/viewcvs/yast?rev=60267&view=rev Log: - added more type information Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Jan 7 14:39:06 2010 @@ -4055,9 +4055,8 @@ * @param boolean foreign_os * @return list of primary partitions */ -global define list GetPrimPartitions( map<string,map> targets, - boolean foreign_os ) - ``{ +list<map> GetPrimPartitions(map<string, map> targets, boolean foreign_os) + { list<map> ret = []; map entry = $[]; string text = ""; @@ -4178,9 +4177,10 @@ return( ret ); } -global define list GetWinPrimPartitions( map<string,map> targets ) - ``{ - list ret = GetPrimPartitions( targets, true ); + +global list<map> GetWinPrimPartitions(map<string, map> targets) + { + list<map> ret = GetPrimPartitions( targets, true ); y2milestone( "GetWinPrimPartitions ret %1", ret ); return( ret ); } @@ -4288,13 +4288,13 @@ } -global define list GetForeignPrimary() - ``{ - list ret = []; + +global list<string> GetForeignPrimary() + { + list<string> ret = []; if( Arch::i386 () || Arch::ia64 () || Arch::x86_64 () ) { - foreach(map e, (list<map>)GetPrimPartitions( GetTargetMap(), false ), - ``{ + foreach(map e, GetPrimPartitions( GetTargetMap(), false ), { ret = add( ret, sformat( "%1 %2", e["device"]:"", e["string"]:"" )); }); } @@ -4302,6 +4302,7 @@ return( ret ); } + /** * Returns whether a partition is resizable * -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60266 - /trunk/autoinstallation/src/include/io.ycp
by ug＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: ug Date: Thu Jan 7 14:37:31 2010 New Revision: 60266 URL: http://svn.opensuse.org/viewcvs/yast?rev=60266&view=rev Log: old usb:// code dropped after testrun of the new code Modified: trunk/autoinstallation/src/include/io.ycp Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.… ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Thu Jan 7 14:37:31 2010 @@ -238,10 +238,9 @@ WFM::Execute(.local.umount, mount_point); } -// else if (Scheme == "floppy" || Scheme == "usb") else if (Scheme == "floppy") { - if (StorageDevices::FloppyReady() && Scheme == "floppy") + if (StorageDevices::FloppyReady()) { WFM::Execute(.local.mount, [StorageDevices::FloppyDevice(), mount_point]); @@ -256,40 +255,6 @@ } SCR::Execute(.target.umount, mount_point); } - /* - } else { - y2milestone("looking for %1 on USB", Path); - list<map> probe = (list<map>)SCR::Read(.probe.usb); - foreach( map d, probe, ``{ - if( d["bus"]:"USB" == "SCSI" && haskey(d, "dev_name") ) { - integer i = 0; - string dev = d["dev_name"]:""; - while( SCR::Read(.target.lstat, dev) != $[] || i < 5 ) { - if( !(boolean)WFM::Execute(.local.mount, [ dev, mount_point ]) ) { - y2milestone("mount failed for %1", dev); - i = i + 1; - dev = d["dev_name"]:"" + sformat("%1",i); - continue; - } - if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 0) { - y2milestone("not found on %1",dev); - } else { - y2milestone("found on %1", dev); - GET_error = ""; - ok = true; - } - SCR::Execute(.target.umount, mount_point); - if( ok == true ) - break; - i = i + 1; - dev = d["dev_name"]:"" + sformat("%1",i); - } - } - if( ok == true ) - break; - }); - } - */ } else if (Scheme == "device" || Scheme == "usb" ) // Device or USB { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60265 - in /trunk/control-center: package/yast2-control-center.changes yast2-control-center.spec.in
by jsrain＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsrain Date: Thu Jan 7 14:27:56 2010 New Revision: 60265 URL: http://svn.opensuse.org/viewcvs/yast?rev=60265&view=rev Log: added yast2-control-center-qt Recommends yast2-qt (bnc#545331) Modified: trunk/control-center/package/yast2-control-center.changes trunk/control-center/yast2-control-center.spec.in Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Thu Jan 7 14:27:56 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 7 14:24:15 CET 2010 - jsrain(a)suse.cz + +- added yast2-control-center-qt Recommends yast2-qt (bnc#545331) + +------------------------------------------------------------------- Thu Dec 10 13:03:24 CET 2009 - kmachalkova(a)suse.cz - Correctly show GenericNames containing comma (convert QStringList Modified: trunk/control-center/yast2-control-center.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/yast2-control-cen… ============================================================================== --- trunk/control-center/yast2-control-center.spec.in (original) +++ trunk/control-center/yast2-control-center.spec.in Thu Jan 7 14:27:56 2010 @@ -20,6 +20,7 @@ Requires: yast2-control-center Provides: yast2-control-center-binary Provides: yast2-control-center:%{_prefix}/lib/YaST2/bin/y2controlcenter +Recommends: yast2-qt Supplements: kdebase3 Supplements: kdebase4-session Group: System/YaST -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60264 - /trunk/yast2/library/modules/FileUtils.ycp
by kmachalkova＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: kmachalkova Date: Thu Jan 7 14:27:45 2010 New Revision: 60264 URL: http://svn.opensuse.org/viewcvs/yast?rev=60264&view=rev Log: docu Modified: trunk/yast2/library/modules/FileUtils.ycp Modified: trunk/yast2/library/modules/FileUtils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/FileUtils.… ============================================================================== --- trunk/yast2/library/modules/FileUtils.ycp (original) +++ trunk/yast2/library/modules/FileUtils.ycp Thu Jan 7 14:27:45 2010 @@ -379,6 +379,19 @@ return filemd5; } + /** + * Changes ownership of a file/directory + * + * @return boolean true if succeeded + * @param string user and group name (in the form 'user:group') + * @param string file name + * @param boolean recursive, true if file (2nd param) is a directory + * + * @example + * FileUtils::Chown ( "somebody:somegroup", "/etc/passwd", false) -> 'chown somebody:somegroup /etc/passwd' + * FileUtils::Chown ( "nobody:nogroup", "/tmp", true) -> 'chown nobody:nogroup -R /tmp' + */ + global boolean Chown( string usergroup, string file, boolean recursive) { y2milestone("Setting ownership of file %1 to %2", file, usergroup); @@ -389,10 +402,23 @@ if( retval != 0) y2error("Cannot chown %1", file); - + return (retval == 0); } + /** + * Changes access rights to a file/directory + * + * @return boolean true if succeeded + * @param string modes ( e.g. '744' or 'u+x') + * @param string file name + * @param boolean recursive, true if file (2nd param) is a directory + * + * @example + * FileUtils::Chmod ( "go-rwx", "/etc/passwd", false) -> 'chmod go-rwx /etc/passwd' + * FileUtils::Chmod ( "700", "/tmp", true) -> 'chmod 700 -R /tmp' + */ + global boolean Chmod (string modes, string file, boolean recursive) { y2milestone("Setting access rights of file %1 to %2", file, modes); @@ -434,16 +460,38 @@ return tmpfile; } + /** + * Creates temporary file + * + * @return string resulting file name or nil on failure + * @param string template for file name e.g. 'tmp.XXXX' + * @param string tmp file owner in a form 'user:group' + * @param string tmp file access rights + * + * @example + * FileUtils::MkTempFile ( "/tmp/tmpfile.XXXX", "somebody:somegroup", "744") + */ + global string MkTempFile (string template, string usergroup, string modes) { return MkTempInternal( template, usergroup, modes, false ); } + /** + * The same as MkTempFile, for directories ('mktemp -d ... '). See above + * + * @example + * FileUtils::MkTempDirectory ( "/tmp/tmpdir.XXXX", "nobody:nogroup", "go+x") + */ global string MkTempDirectory (string template, string usergroup, string modes) { return MkTempInternal( template, usergroup, modes, true ); } + /** + * Removes files and dirs created in all previous calls to MkTemp[File|Directory] + * + */ global void CleanupTemp() { foreach (string one_file, tmpfiles, { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60263 - in /trunk/yast2: package/yast2.changes scripts/yast2
by jsrain＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsrain Date: Thu Jan 7 14:27:42 2010 New Revision: 60263 URL: http://svn.opensuse.org/viewcvs/yast?rev=60263&view=rev Log: updated start-up script to behave correctly if QT CC is to be used without QT back-end (bnc#545331) Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Jan 7 14:27:42 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 7 14:26:21 CET 2010 - jsrain(a)suse.cz + +- updated start-up script to behave correctly if QT CC is to be + used without QT back-end (bnc#545331) + +------------------------------------------------------------------- Tue Jan 5 15:07:54 UTC 2010 - lslezak(a)suse.cz - added missing UI::SetProductName() call - display the proper Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=60263&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Thu Jan 7 14:27:42 2010 @@ -183,16 +183,25 @@ if check_gtk; then SELECTED_GUI=gtk else - echo >&2 "GTK GUI wanted but not found, falling back to Qt." - WANTED_GUI=qt + if check_qt; then + SELECTED_GUI=qt + WANTED_GUI=qt + echo >&2 "GTK GUI wanted but not found, falling back to Qt." + else + echo >&2 "GTK GUI wanted but not found, falling back to ncurses." + fi fi - fi - - if [ "$WANTED_GUI" = "qt" ]; then + elif [ "$WANTED_GUI" = "qt" ]; then if check_qt; then SELECTED_GUI=qt else - echo >&2 "Qt GUI wanted but not found, falling back to ncurses." + if check_gtk; then + SELECTED_GUI=gtk + WANTED_GUI=gtk + echo >&2 "Qt GUI wanted but not found, falling back to GTK." + else + echo >&2 "Qt GUI wanted but not found, falling back to ncurses." + fi fi elif [ "$SELECTED_GUI" != "gtk" -a "$WANTED_GUI" != "ncurses" ]; then echo >&2 "Unknown GUI '$WANTED_GUI', falling back to ncurses." -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60262 - /branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/Makefile.am
by mvidner＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: mvidner Date: Thu Jan 7 14:20:15 2010 New Revision: 60262 URL: http://svn.opensuse.org/viewcvs/yast?rev=60262&view=rev Log: Distribute also URLRecode.pm in the tarball (amending r60252) Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/Makefile.am Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/Makefile.am Thu Jan 7 14:20:15 2010 @@ -1,6 +1,6 @@ # Makefile.am for yast2/library/types/src -module_DATA = $(wildcard *.ycp) +module_DATA = $(wildcard *.ycp) $(wildcard *.pm) EXTRA_DIST = $(module_DATA) include $(top_srcdir)/Makefile.am.common -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60261 - /trunk/yast2/library/modules/FileUtils.ycp
by kmachalkova＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: kmachalkova Date: Thu Jan 7 13:51:19 2010 New Revision: 60261 URL: http://svn.opensuse.org/viewcvs/yast?rev=60261&view=rev Log: New funcs (chmod/own, mktemp) Modified: trunk/yast2/library/modules/FileUtils.ycp Modified: trunk/yast2/library/modules/FileUtils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/FileUtils.… ============================================================================== --- trunk/yast2/library/modules/FileUtils.ycp (original) +++ trunk/yast2/library/modules/FileUtils.ycp Thu Jan 7 13:51:19 2010 @@ -18,6 +18,8 @@ import "Popup"; import "String"; + list <string> tmpfiles = []; + /** * Function which determines if the requested file/directory exists. * @@ -377,5 +379,78 @@ return filemd5; } + global boolean Chown( string usergroup, string file, boolean recursive) + { + y2milestone("Setting ownership of file %1 to %2", file, usergroup); + + string cmd = sformat("chown %1 %2 %3", usergroup, (recursive ? "-R" : "" ), file); + + integer retval = (integer) SCR::Execute(.target.bash, cmd); + + if( retval != 0) + y2error("Cannot chown %1", file); + + return (retval == 0); + } + + global boolean Chmod (string modes, string file, boolean recursive) + { + y2milestone("Setting access rights of file %1 to %2", file, modes); + + string cmd = sformat("chmod %1 %2 %3", modes, (recursive ? "-R" : "" ), file); + + integer retval = (integer) SCR::Execute(.target.bash, cmd); + + if( retval != 0) + y2error("Cannot chmod %1", file); + + return (retval == 0); + + } + + string MkTempInternal (string template, string usergroup, string modes, boolean directory) + { + string mktemp = sformat("/bin/mktemp %1 %2", + (directory ? "-d" : ""), template); + + map cmd_out = (map) SCR::Execute (.target.bash_output, mktemp); + if (cmd_out["exit"]:-1 != 0) { + y2error ("Error creating temporary file: %1", cmd_out); + return nil; + } + + string tmpfile = splitstring (cmd_out["stdout"]:"", "\n")[0]:""; + + if (tmpfile == nil || tmpfile == "") { + y2error ("Error creating temporary file: %1 - empty output", cmd_out); + return nil; + } + + if( !Chown( usergroup, tmpfile, directory) || !Chmod( modes, tmpfile, directory)) { + return nil; + } + + tmpfiles = add(tmpfiles, tmpfile); + return tmpfile; + } + + global string MkTempFile (string template, string usergroup, string modes) + { + return MkTempInternal( template, usergroup, modes, false ); + } + + global string MkTempDirectory (string template, string usergroup, string modes) + { + return MkTempInternal( template, usergroup, modes, true ); + } + + global void CleanupTemp() + { + foreach (string one_file, tmpfiles, { + y2milestone("Removing %1", one_file); + SCR::Execute (.target.bash, sformat ("/bin/rm -rf '%1'", one_file)); + }); + } + /* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60260 - /tags/branch-Code-11-SP1-2_17_66/packager/
by lslezak＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: lslezak Date: Thu Jan 7 13:47:48 2010 New Revision: 60260 URL: http://svn.opensuse.org/viewcvs/yast?rev=60260&view=rev Log: Created tag branch-Code-11-SP1-2_17_66 for packager Added: tags/branch-Code-11-SP1-2_17_66/packager/ (props changed) - copied from r60259, branches/SuSE-Code-11-SP1-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60259 - /tags/branch-Code-11-SP1-2_17_66/
by lslezak＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: lslezak Date: Thu Jan 7 13:47:46 2010 New Revision: 60259 URL: http://svn.opensuse.org/viewcvs/yast?rev=60259&view=rev Log: Created tag branch-Code-11-SP1-2_17_66 Added: tags/branch-Code-11-SP1-2_17_66/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60258 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/modules/SourceDialogs.ycp src/modules/SourceManager.ycp yast2-packager.spec.in
by lslezak＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: lslezak Date: Thu Jan 7 13:47:42 2010 New Revision: 60258 URL: http://svn.opensuse.org/viewcvs/yast?rev=60258&view=rev Log: - pass the selected CD/DVD device to the package manager in case of multiple devices in the system (bnc#567403) - 2.17.66 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceManager.ycp branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Thu Jan 7 13:47:42 2010 @@ -1 +1 @@ -2.17.65 +2.17.66 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Thu Jan 7 13:47:42 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 7 12:16:03 UTC 2010 - lslezak(a)suse.cz + +- pass the selected CD/DVD device to the package manager in case + of multiple devices in the system (bnc#567403) +- 2.17.66 + +------------------------------------------------------------------- Wed Jan 6 17:48:18 UTC 2010 - lslezak(a)suse.cz - do not reselect patterns which have been deselected by user Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp Thu Jan 7 13:47:42 2010 @@ -20,6 +20,7 @@ import "Label"; import "URL"; +import "URLRecode"; import "Popup"; import "CWM"; import "SourceManager"; @@ -57,6 +58,10 @@ */ boolean _allow_https = true; +// CD/DVD device name to use (e.g. /dev/sr1) in case of multiple +// devices in the system. Empty string means use the default. +string cd_device_name = ""; + /** * Help text suffix for some types of the media */ @@ -1797,8 +1802,21 @@ string msg = selected == `cd ? _("Insert the add-on product CD") : _("Insert the add-on product DVD"); - if (! SourceManager::AskForCD (msg)) + + // reset the device name + cd_device_name = ""; + + // ask for a medium + map<string,any> ui_result = SourceManager::AskForCD (msg); + if (! ui_result["continue"]:false) return false; + + string cd_device = ui_result["device"]:""; + if (cd_device != nil && cd_device != "") + { + y2milestone("Selected CD/DVD device: %1", cd_device); + cd_device_name = cd_device; + } } else if (selected == `usb) { @@ -1848,8 +1866,14 @@ else if ( selected == `https ) _url = "https://"; else if ( selected == `samba ) _url = "smb://"; else if ( selected == `nfs ) _url = "nfs://"; - else if ( selected == `cd ) _url = "cd:///"; - else if ( selected == `dvd ) _url = "dvd:///"; + else if ( selected == `cd || selected == `dvd) + { + _url = (selected == `cd) ? "cd:///" : "dvd:///"; + if (cd_device_name != "") + { + _url = _url + "?devices=" + URLRecode::EscapeQuery(cd_device_name); + } + } else if ( selected == `hd ) _url = "hd://"; else if ( selected == `usb ) _url = "usb://"; else if ( selected == `local_dir ) _url = "dir://"; Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceManager.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceManager.ycp Thu Jan 7 13:47:42 2010 @@ -1375,13 +1375,13 @@ /** * */ -global boolean AskForCD (string message) { +global map<string,any> AskForCD (string message) { list<map<string,any> > cdroms = (list<map<string,any> >) SCR::Read (.probe.cdrom); boolean multiple_drives = size (cdroms) > 1; term drives_sel = `Empty (); - list<string> devices = maplist (map<string,any> d, cdroms, { - return d["dev_name"]:""; + list<term> devices = maplist (map<string,any> d, cdroms, { + return `item(`id(d["dev_name"]:""), d["model"]:"" + " (" + (d["dev_name"]:"") + ")" ); }); if (multiple_drives) { @@ -1405,7 +1405,7 @@ ), `HSpacing (1)); UI::OpenDialog (contents); if (multiple_drives) - UI::ChangeWidget (`id (`drives), `CurrentItem, devices[0]:""); + UI::ChangeWidget (`id (`drives), `CurrentItem, cdroms[0,"dev_name"]:""); UI::SetFocus (`id (`cont)); symbol ret = nil; while (true) @@ -1425,13 +1425,22 @@ else { SCR::Execute (.target.bash, sformat ("/bin/eject %1", - devices[0]:"")); + cdroms[0,"dev_name"]:"")); } } ret = nil; } + + map<string,any> result = $[ "continue" : (ret == `cont) ]; + + if (multiple_drives) + { + result = add(result, "device", (string)UI::QueryWidget (`id (`drives), `Value)); + } + UI::CloseDialog (); - return ret == `cont; + + return result; } /** Modified: branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Thu Jan 7 13:47:42 2010 @@ -7,8 +7,8 @@ # HTTP.ycp BuildRequires: yast2-transfer -# New WorkflowManager -BuildRequires: yast2 >= 2.17.76 +# URLRecode.pm +BuildRequires: yast2 >= 2.17.79 # "keeppackages" repo property BuildRequires: yast2-pkg-bindings >= 2.17.27 @@ -19,8 +19,8 @@ # "keeppackages" repo property Requires: yast2-pkg-bindings >= 2.17.27 -# New WorkflowManager -Requires: yast2 >= 2.17.76 +# URLRecode.pm +Requires: yast2 >= 2.17.79 # unzipping license file Requires: unzip -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60257 - in /trunk/packager: package/yast2-packager.changes src/modules/SourceDialogs.ycp src/modules/SourceManager.ycp
by lslezak＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: lslezak Date: Thu Jan 7 13:46:56 2010 New Revision: 60257 URL: http://svn.opensuse.org/viewcvs/yast?rev=60257&view=rev Log: - pass the selected CD/DVD device to the package manager in case of multiple devices in the system (bnc#567403) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SourceDialogs.ycp trunk/packager/src/modules/SourceManager.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Jan 7 13:46:56 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 7 12:16:03 UTC 2010 - lslezak(a)suse.cz + +- pass the selected CD/DVD device to the package manager in case + of multiple devices in the system (bnc#567403) + +------------------------------------------------------------------- Wed Jan 6 17:48:18 UTC 2010 - lslezak(a)suse.cz - do not reselect patterns which have been deselected by user Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Thu Jan 7 13:46:56 2010 @@ -20,6 +20,7 @@ import "Label"; import "URL"; +import "URLRecode"; import "Popup"; import "CWM"; import "SourceManager"; @@ -57,6 +58,10 @@ */ boolean _allow_https = true; +// CD/DVD device name to use (e.g. /dev/sr1) in case of multiple +// devices in the system. Empty string means use the default. +string cd_device_name = ""; + /** * Help text suffix for some types of the media */ @@ -1854,8 +1859,21 @@ string msg = selected == `cd ? _("Insert the add-on product CD") : _("Insert the add-on product DVD"); - if (! SourceManager::AskForCD (msg)) + + // reset the device name + cd_device_name = ""; + + // ask for a medium + map<string,any> ui_result = SourceManager::AskForCD (msg); + if (! ui_result["continue"]:false) return false; + + string cd_device = ui_result["device"]:""; + if (cd_device != nil && cd_device != "") + { + y2milestone("Selected CD/DVD device: %1", cd_device); + cd_device_name = cd_device; + } } else if (selected == `usb) { @@ -1905,8 +1923,14 @@ else if ( selected == `https ) _url = "https://"; else if ( selected == `samba ) _url = "smb://"; else if ( selected == `nfs ) _url = "nfs://"; - else if ( selected == `cd ) _url = "cd:///"; - else if ( selected == `dvd ) _url = "dvd:///"; + else if ( selected == `cd || selected == `dvd) + { + _url = (selected == `cd) ? "cd:///" : "dvd:///"; + if (cd_device_name != "") + { + _url = _url + "?devices=" + URLRecode::EscapeQuery(cd_device_name); + } + } else if ( selected == `hd ) _url = "hd://"; else if ( selected == `usb ) _url = "usb://"; else if ( selected == `local_dir ) _url = "dir://"; Modified: trunk/packager/src/modules/SourceManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceManag… ============================================================================== --- trunk/packager/src/modules/SourceManager.ycp (original) +++ trunk/packager/src/modules/SourceManager.ycp Thu Jan 7 13:46:56 2010 @@ -729,13 +729,13 @@ /** * */ -global boolean AskForCD (string message) { +global map<string,any> AskForCD (string message) { list<map<string,any> > cdroms = (list<map<string,any> >) SCR::Read (.probe.cdrom); boolean multiple_drives = size (cdroms) > 1; term drives_sel = `Empty (); - list<string> devices = maplist (map<string,any> d, cdroms, { - return d["dev_name"]:""; + list<term> devices = maplist (map<string,any> d, cdroms, { + return `item(`id(d["dev_name"]:""), d["model"]:"" + " (" + (d["dev_name"]:"") + ")" ); }); if (multiple_drives) { @@ -759,7 +759,7 @@ ), `HSpacing (1)); UI::OpenDialog (contents); if (multiple_drives) - UI::ChangeWidget (`id (`drives), `CurrentItem, devices[0]:""); + UI::ChangeWidget (`id (`drives), `CurrentItem, cdroms[0,"dev_name"]:""); UI::SetFocus (`id (`cont)); symbol ret = nil; while (true) @@ -779,13 +779,22 @@ else { SCR::Execute (.target.bash, sformat ("/bin/eject %1", - devices[0]:"")); + cdroms[0,"dev_name"]:"")); } } ret = nil; } + + map<string,any> result = $[ "continue" : (ret == `cont) ]; + + if (multiple_drives) + { + result = add(result, "device", (string)UI::QueryWidget (`id (`drives), `Value)); + } + UI::CloseDialog (); - return ret == `cont; + + return result; } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60256 - /tags/branch-Code-11-SP1-2_17_32/autoinstallation/
by ug＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: ug Date: Thu Jan 7 11:47:02 2010 New Revision: 60256 URL: http://svn.opensuse.org/viewcvs/yast?rev=60256&view=rev Log: Created tag branch-Code-11-SP1-2_17_32 for autoinstallation Added: tags/branch-Code-11-SP1-2_17_32/autoinstallation/ (props changed) - copied from r60255, branches/SuSE-Code-11-SP1-Branch/autoinstallation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60255 - in /branches/SuSE-Code-11-SP1-Branch/autoinstallation: VERSION package/autoyast2.changes
by ug＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: ug Date: Thu Jan 7 11:46:55 2010 New Revision: 60255 URL: http://svn.opensuse.org/viewcvs/yast?rev=60255&view=rev Log: 2.17.32 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION Thu Jan 7 11:46:55 2010 @@ -1 +1 @@ -2.17.31 +2.17.32 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Thu Jan 7 11:46:55 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 7 10:36:45 CET 2010 - ug(a)suse.de + +- 2.17.32 + +------------------------------------------------------------------- Wed Dec 23 14:14:11 CET 2009 - ug(a)suse.de - fix for already mounted USB devices (bnc#565558) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60254 - in /branches/SuSE-Code-11-SP1-Branch/yast2: VERSION package/yast2.changes scripts/yast2
by mvidner＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: mvidner Date: Thu Jan 7 10:46:44 2010 New Revision: 60254 URL: http://svn.opensuse.org/viewcvs/yast?rev=60254&view=rev Log: YaST would not start from the GNOME menu (Unknown option -S) bnc#568424. Duplicate of bnc#537470, so just copied r58631 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes branches/SuSE-Code-11-SP1-Branch/yast2/scripts/yast2 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/VERSION Thu Jan 7 10:46:44 2010 @@ -1 +1 @@ -2.17.79 +2.17.80 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Thu Jan 7 10:46:44 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 7 10:43:13 CET 2010 - mvidner(a)suse.cz + +- YaST would not start from the GNOME menu (Unknown option -S) bnc#568424. +- 2.17.80 + +------------------------------------------------------------------- Thu Jan 7 08:20:23 UTC 2010 - lslezak(a)suse.cz - URL.ycp - escape non-ASCII characters in URL, added URLRecode.pm Modified: branches/SuSE-Code-11-SP1-Branch/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/scripts/yast2 (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/scripts/yast2 Thu Jan 7 10:46:44 2010 @@ -232,10 +232,13 @@ # Pass the arguments to WFM::Args(): # Surround all args by (...). args may contain spaces. # Use -S to avoid YCP escaping (bnc#382883) -a=("$@") -b=("${a[@]/#/(}") -c=("${b[@]/%/)}") -set -- -S "${c[@]}" +# But avoid a lone -S (cc-gnome dies, bnc#537470) +if [ $# -gt 0 ]; then + a=("$@") + b=("${a[@]/#/(}") + c=("${b[@]/%/)}") + set -- -S "${c[@]}" +fi case "`basename $0`" in YaST|yast|yast1|zast) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60253 - /tags/branch-Code-11-SP1-2_17_79/yast2/
by lslezak＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: lslezak Date: Thu Jan 7 09:59:27 2010 New Revision: 60253 URL: http://svn.opensuse.org/viewcvs/yast?rev=60253&view=rev Log: Created tag branch-Code-11-SP1-2_17_79 for yast2 Added: tags/branch-Code-11-SP1-2_17_79/yast2/ (props changed) - copied from r60252, branches/SuSE-Code-11-SP1-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60252 - in /branches/SuSE-Code-11-SP1-Branch/yast2: ./ library/types/src/ library/types/testsuite/tests/ package/
by lslezak＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: lslezak Date: Thu Jan 7 09:59:20 2010 New Revision: 60252 URL: http://svn.opensuse.org/viewcvs/yast?rev=60252&view=rev Log: - URL.ycp - escape non-ASCII characters in URL, added URLRecode.pm module (bnc#446395) - 2.17.79 Added: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/URLRecode.pm branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URLRecode.err branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URLRecode.out branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URLRecode.ycp Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/URL.ycp branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URL.out branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URL.ycp branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/VERSION Thu Jan 7 09:59:20 2010 @@ -1 +1 @@ -2.17.78 +2.17.79 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/URL.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/URL.ycp Thu Jan 7 09:59:20 2010 @@ -17,6 +17,7 @@ import "Hostname"; import "String"; import "IP"; +import "URLRecode"; /** * TODO: @@ -203,9 +204,9 @@ pth = substring (pth, 1); } } - tokens["path"] = UnEscapeString(pth, transform_map_filename); - tokens["query"] = UnEscapeString(rawtokens[5]:"", transform_map_query); - tokens["fragment"] = UnEscapeString(rawtokens[7]:"", transform_map_passwd); + tokens["path"] = URLRecode::UnEscape(pth); + tokens["query"] = URLRecode::UnEscape(rawtokens[5]:""); + tokens["fragment"] = URLRecode::UnEscape(rawtokens[7]:""); /* Extract username:pass@host:port */ list userpass = regexptokenize(rawtokens[2]:"", "^" + @@ -219,8 +220,8 @@ ); y2debug("userpass=%1", userpass); - tokens["user"] = UnEscapeString(userpass[1]:"", transform_map_passwd); - tokens["pass"] = UnEscapeString(userpass[3]:"", transform_map_passwd); + tokens["user"] = URLRecode::UnEscape(userpass[1]:""); + tokens["pass"] = URLRecode::UnEscape(userpass[3]:""); tokens["port"] = userpass[7]:""; if(userpass[5]:"" != "") @@ -318,6 +319,8 @@ string url = ""; string userpass = ""; + y2debug("URL::Build(): input: %1", tokens); + if(regexpmatch(tokens["scheme"]:"", "^[[:alpha:]]*$")) { /* if (tokens["scheme"]:"" == "samba") url="smb"; @@ -326,12 +329,12 @@ y2debug("url: %1", url); if (tokens["user"]:"" != "") { - userpass = EscapeString(tokens["user"]:"", transform_map_passwd); + userpass = URLRecode::EscapePassword(tokens["user"]:""); y2milestone("Escaped username '%1' => '%2'", tokens["user"]:"", userpass); } if (size(userpass) != 0 && tokens["pass"]:"" != "" ) { - userpass = sformat("%1:%2", userpass, EscapeString(tokens["pass"]:"", transform_map_passwd) ); + userpass = sformat("%1:%2", userpass, URLRecode::EscapePassword(tokens["pass"]:"") ); } if (size(userpass) > 0 ) userpass = userpass + "@"; @@ -355,21 +358,22 @@ // path is not empty and doesn't start with "/" if (tokens["path"]:"" != "" && ! regexpmatch (tokens["path"]:"", "^/")) - url = sformat("%1/%2", url, EscapeString(tokens["path"]:"", transform_map_filename)); + url = sformat("%1/%2", url, URLRecode::EscapePath(tokens["path"]:"")); // patch is not empty and starts with "/" else if (tokens["path"]:"" != "" && regexpmatch (tokens["path"]:"", "^/")) { while (substring (tokens["path"]:"", 0, 2) == "//") tokens["path"] = substring (tokens["path"]:"", 1); if (tokens["scheme"]:"" == "ftp") { - url = sformat("%1/%%2f%2", url, substring(EscapeString(tokens["path"]:"", transform_map_filename), 1)); + url = sformat("%1/%%2f%2", url, substring(URLRecode::EscapePath(tokens["path"]:""), 1)); } else { - url = sformat("%1%2", url, EscapeString(tokens["path"]:"", transform_map_filename)); + url = sformat("%1%2", url, URLRecode::EscapePath(tokens["path"]:"")); } } y2debug("url: %1", url); + map<string,string> query_map = MakeMapFromParams(tokens["query"]:""); if (tokens["scheme"]:"" == "smb" && size(tokens["domain"]:"")>0 && query_map["workgroup"]:"" != tokens["domain"]:"") @@ -380,9 +384,10 @@ } if (tokens["query"]:"" != "" ) - url = sformat("%1?%2", url, EscapeString(tokens["query"]:"", transform_map_query)); + url = sformat("%1?%2", url, URLRecode::EscapeQuery(tokens["query"]:"")); + if (tokens["fragment"]:"" != "" ) - url = sformat("%1#%2", url, EscapeString(tokens["fragment"]:"", transform_map_passwd)); + url = sformat("%1#%2", url, URLRecode::EscapePassword(tokens["fragment"]:"")); y2debug("url: %1", url); if (!Check(url)) { @@ -390,6 +395,8 @@ return ""; } + y2debug("URL::Build(): result: %1", url); + return url; } Added: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/URLRecode.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/URLRecode.pm (added) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/URLRecode.pm Thu Jan 7 09:59:20 2010 @@ -0,0 +1,87 @@ +#!/usr/bin/perl -w +# +# Author: Ladislav SlezÃ¡k <lslezak(a)novell.com> +# +# $Id:$ +# +# URLRecode.pm +# +# This is a replacement for URI::Encode perl module which cannot be used in inst-sys +# and to decrease the package dependencies +# + +package URLRecode; + +use strict; +use YaST::YCP qw(:LOGGING Boolean sformat);; + +our %TYPEINFO; +use strict; + +# local cache for char -> hex string conversion +our %escape_cache; + +# fill the cache +sub InitCache +{ + for(0..255) {$escape_cache{chr($_)} = sprintf("%%%02x", $_);} +} + + +# Escape password, user name and fragment part of URL string +# @param input input string +# @return string Escaped string +BEGIN{ $TYPEINFO{EscapePassword} = ["function", "string", "string"];} +sub EscapePassword +{ + my ($self, $escaped) = @_; + + if (!defined %escape_cache) { InitCache(); } + + $escaped =~ s/([^A-Za-z0-9\\-_.!~*'()])/$escape_cache{$1}/ge; + return $escaped; +} + +# Escape path part of URL string +# @param input input string +# @return string Escaped string +BEGIN{ $TYPEINFO{EscapePath} = ["function", "string", "string"];} +sub EscapePath +{ + my ($self, $escaped) = @_; + + if (!defined %escape_cache) { InitCache() }; + + $escaped =~ s/([^A-Za-z0-9\-_.!~*'()\/])/$escape_cache{$1}/ge; + return $escaped; +} + +# Escape query part of URL string +# @param input input string +# @return string Escaped string +BEGIN{ $TYPEINFO{EscapeQuery} = ["function", "string", "string"];} +sub EscapeQuery +{ + my ($self, $escaped) = @_; + + if (!defined %escape_cache) { InitCache(); } + + $escaped =~ s/([^A-Za-z0-9\\-_.!~*'()\/:=&])/$escape_cache{$1}/ge; + return $escaped; +} + + +# UnEscape an URL string, replace %<Hexnum><HexNum> sequences +# by character +# @param input input string +# @return string Unescaped string +BEGIN{ $TYPEINFO{UnEscape} = ["function", "string", "string"];} +sub UnEscape +{ + my ($self, $input) = @_; + + $input =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/ge; + return $input +} + +1; Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URL.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URL.out (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URL.out Thu Jan 7 09:59:20 2010 @@ -21,6 +21,8 @@ Return ftp://ftp.example.com/%2fpath/to/dir Return ftp://ftp.example.com/%2fpath/to/dir Return ftp://ftp.example.com/%2fpath/to/dir +Return ftp://ftp.example.com/%2fpath/to/dir?param1=val1&param2=val2 +Return dir:///path/to/%c4%9b%c5%a1%c4%8d%c5%99%c5%be%c3%bd%c3%a1%c3%ad%c3%a9/dir Return ftp://[2001:de8:0:f123::1]/%2fpath/to/dir Return http://[2001:de8:0:f123::1]:8080/path/to/dir Return $["fragment":"", "host":"2001:de8:0:f123::1", "pass":"", "path":"/path/to/dir", "port":"", "query":"", "scheme":"http", "user":""] Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URL.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URL.ycp Thu Jan 7 09:59:20 2010 @@ -10,6 +10,13 @@ { include "testsuite.ycp"; +map READ = $[ + "target" : $[ + "tmpdir" : "/tmp" + ] +]; +TESTSUITE_INIT ([READ], nil); + import "URL"; TEST(``(URL::Parse("http://name:pass@www.suse.cz:80/path/index.html?question#part")), [], nil); @@ -50,6 +57,10 @@ TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"/path/to/dir"])), [], nil); TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"//path/to/dir"])), [], nil); TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"///path/to/dir"])), [], nil); +TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"///path/to/dir", "query" : "param1=val1&param2=val2" ])), [], nil); + +// bnc #446395 - non-ASCII chars in path must be escaped +TEST(``(URL::Build($["scheme":"dir", "path":"/path/to/ÄÅ¡ÄÅÅ¾Ã½Ã¡ÃÃ©/dir"])), [], nil); // IPv6 tests TEST(``(URL::Build($["scheme":"ftp","host":"2001:de8:0:f123::1","path":"///path/to/dir"])), [], nil); Added: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URLRecode.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URLRecode.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URLRecode.out (added) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URLRecode.out Thu Jan 7 09:59:20 2010 @@ -0,0 +1,7 @@ +Return nil +Return +Return /%40%23%24%25%5e%26/dir/%c4%8d%c3%bd%c4%9b%c5%a1%c4%8d%c3%bd%c3%a1/file +Return true +Return %20!%40%23%24%25%5e%26*()/%3f%2b%3d +Return %20!%40%23%24%25^%26*()%2f%3f%2b%3d +Return %20!%40%23%24%25^&*()/%3f%2b= Added: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URLRecode.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URLRecode.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/types/testsuite/tests/URLRecode.ycp Thu Jan 7 09:59:20 2010 @@ -0,0 +1,27 @@ +/** + * Testsuite for URLRecode.pm module + * + * $Id: URLRecode.ycp 57027 2009-04-29 10:24:13Z lslezak $ + */ + +{ + +include "testsuite.ycp"; +import "URLRecode"; + + +TEST(``(URLRecode::EscapePath(nil)), [], nil); +TEST(``(URLRecode::EscapePath("")), [], nil); + +string test_path = "/@#$%^&/dir/ÄÃ½ÄÅ¡ÄÃ½Ã¡/file"; + +TEST(``(URLRecode::EscapePath(test_path)), [], nil); +TEST(``(URLRecode::UnEscape(URLRecode::EscapePath(test_path)) == test_path), [], nil); + + +TEST(``(URLRecode::EscapePath(" !@#$%^&*()/?+=")), [], nil); +TEST(``(URLRecode::EscapePassword(" !@#$%^&*()/?+=")), [], nil); +TEST(``(URLRecode::EscapeQuery(" !@#$%^&*()/?+=")), [], nil); + +/* EOF */ +} Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Thu Jan 7 09:59:20 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 7 08:20:23 UTC 2010 - lslezak(a)suse.cz + +- URL.ycp - escape non-ASCII characters in URL, added URLRecode.pm + module (bnc#446395) +- 2.17.79 + +------------------------------------------------------------------- Tue Jan 5 15:07:54 UTC 2010 - lslezak(a)suse.cz - added missing UI::SetProductName() call - display the proper -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60251 - /trunk/gtk/src/pkg/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: rpmcruz Date: Thu Jan 7 03:37:46 2010 New Revision: 60251 URL: http://svn.opensuse.org/viewcvs/yast?rev=60251&view=rev Log: Something to enable in the future. Modified: trunk/gtk/src/pkg/YGPackageSelector.cc Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Thu Jan 7 03:37:46 2010 @@ -2845,6 +2845,10 @@ : m_link_popup (NULL) { m_text = ygtk_rich_text_new(); +/* + ygtk_rich_text_set_text (YGTK_RICH_TEXT (m_text), + _("<i>Write a little introductory text here</i>")); +*/ YGtkPackageView *view = ygtk_package_view_new (TRUE); m_pkg_view = GTK_WIDGET (view); //gtk_widget_set_size_request (m_pkg_view, -1, 200); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60250 - in /trunk/gtk: ChangeLog src/YGPackageSelectorPluginStub.cc src/pkg/YGPackageSelector.cc src/pkg/ygtkpackageview.cc src/pkg/yzyppwrapper.cc src/pkg/yzyppwrapper.h
by rpmcruz＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: rpmcruz Date: Thu Jan 7 01:36:18 2010 New Revision: 60250 URL: http://svn.opensuse.org/viewcvs/yast?rev=60250&view=rev Log: * src/pkg/yzyppwrapper.h/cc: added API to read changes log. * src/pkg/YGPackageSelector.cc: improved look of --undo-old-style. * src/pkg/YGPackageSelector.cc: as requested by Atri, added previous changes to the changes sidebar. See flag --undo-log-all and --undo-log-changed. * src/pkg/ygtkpackageview.cc: changed action button label/stock behavior. * src/pkg/ygtkpackageview.cc: as suggested by Atri, added flag --action-col-label to allow disabling action button labels. * src/pkg/ygtkpackageview.cc: added --colorful-rows. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpackageview.cc trunk/gtk/src/pkg/yzyppwrapper.cc trunk/gtk/src/pkg/yzyppwrapper.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60250&r1=60249… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Jan 7 01:36:18 2010 @@ -1,3 +1,21 @@ +2010-01-07 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/yzyppwrapper.h/cc: added API to read changes log. + + * src/pkg/YGPackageSelector.cc: improved look of --undo-old-style. + + * src/pkg/YGPackageSelector.cc: as requested by Atri, + added previous changes to the changes sidebar. See flag + --undo-log-all and --undo-log-changed. + + * src/pkg/ygtkpackageview.cc: changed action button label/stock + behavior. + + * src/pkg/ygtkpackageview.cc: as suggested by Atri, added + flag --action-col-label to allow disabling action button labels. + + * src/pkg/ygtkpackageview.cc: added --colorful-rows. + 2009-12-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/YGPackageSelector.cc: added --status-top Modified: trunk/gtk/src/YGPackageSelectorPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelectorPluginS… ============================================================================== --- trunk/gtk/src/YGPackageSelectorPluginStub.cc (original) +++ trunk/gtk/src/YGPackageSelectorPluginStub.cc Thu Jan 7 01:36:18 2010 @@ -14,10 +14,12 @@ bool search_entry_side = true, search_entry_top = false, dynamic_sidebar = false, categories_side = true, categories_top = false, status_side = false, status_top = false, status_tabs = true, status_tabs_as_actions = false, - undo_side = false, undo_tab = true, undo_old_style = false, status_col = false, - action_col = true, action_col_as_button = true, action_col_as_check = false, - version_col = true, single_line_rows = false, details_start_hide = true, - toolbar_top = false, toolbar_yast = false, arrange_by = false; + undo_side = false, undo_tab = true, undo_old_style = false, undo_log_all = false, + undo_log_changed = false, status_col = false, action_col = true, + action_col_as_button = true, action_col_as_check = false, action_col_label = true, + version_col = true, single_line_rows = false, colorful_rows = false, + details_start_hide = true, toolbar_top = false, toolbar_yast = false, + arrange_by = false; struct Arg { const char *arg; @@ -36,12 +38,16 @@ { "undo-side", &undo_side }, { "undo-tab", &undo_tab }, { "undo-old-style", &undo_old_style }, + { "undo-log-all", &undo_log_all }, + { "undo-log-changed", &undo_log_changed }, { "status-col", &status_col }, { "action-col", &action_col }, { "action-col-as-button", &action_col_as_button }, { "action-col-as-check", &action_col_as_check }, + { "action-col-label", &action_col_label }, { "version-col", &version_col }, { "single-line-rows", &single_line_rows }, + { "colorful-rows", &colorful_rows }, { "details-start-hide", &details_start_hide }, { "toolbar-top", &toolbar_top }, { "toolbar-yast", &toolbar_yast }, Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Thu Jan 7 01:36:18 2010 @@ -29,9 +29,9 @@ // experiments: extern bool search_entry_side, search_entry_top, dynamic_sidebar, categories_side, categories_top, status_side, status_top, status_tabs, status_tabs_as_actions, - undo_side, undo_tab, undo_old_style, status_col, action_col, action_col_as_button, - action_col_as_check, version_col, single_line_rows, details_start_hide, - toolbar_top, toolbar_yast, arrange_by; + undo_side, undo_tab, undo_old_style, undo_log_all, undo_log_changed, status_col, + action_col, action_col_as_button, action_col_as_check, version_col, + single_line_rows, details_start_hide, toolbar_top, toolbar_yast, arrange_by; //** UI components -- split up for re-usability, but mostly for readability @@ -168,6 +168,43 @@ #endif }; +static void small_button_style_set_cb (GtkWidget *button, GtkStyle *prev_style) +{ + // based on gedit + int width, height; + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button), + GTK_ICON_SIZE_MENU, &width, &height); + gtk_widget_set_size_request (button, width+2, height+2); +} + +static GtkWidget *create_small_button (const char *stock_icon, const char *tooltip) +{ + static bool first_time = true; + if (first_time) { + first_time = false; + gtk_rc_parse_string ( + "style \"small-button-style\"\n" + "{\n" + " GtkWidget::focus-padding = 0\n" + " GtkWidget::focus-line-width = 0\n" + " xthickness = 0\n" + " ythickness = 0\n" + "}\n" + "widget \"*.small-button\" style \"small-button-style\""); + } + + GtkWidget *button = gtk_button_new(); + gtk_widget_set_name (button, "small-button"); + gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); + gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (button, tooltip); + GtkWidget *image = gtk_image_new_from_stock (stock_icon, GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (button), image); + g_signal_connect (G_OBJECT (button), "style-set", + G_CALLBACK (small_button_style_set_cb), NULL); + return button; +} + class ChangesPane : public Ypp::PkgList::Listener { struct Entry { @@ -179,13 +216,10 @@ m_label = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (m_label), 0, 0.5); gtk_label_set_ellipsize (GTK_LABEL (m_label), PANGO_ELLIPSIZE_END); - m_button = gtk_button_new(); - gtk_widget_set_tooltip_text (m_button, _("Undo")); - GtkWidget *undo_image = gtk_image_new_from_stock (GTK_STOCK_UNDO, GTK_ICON_SIZE_MENU); - gtk_button_set_image (GTK_BUTTON (m_button), undo_image); + m_button = create_small_button (GTK_STOCK_UNDO, _("Undo")); m_box = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (m_box), m_label, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (m_box), m_button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (m_box), m_button, FALSE, TRUE, 0); gtk_widget_show_all (m_box); modified (package); g_signal_connect (G_OBJECT (m_button), "clicked", @@ -232,46 +266,120 @@ } }; -GtkWidget *m_box, *m_entries_box; + struct LogEntry { + GtkWidget *m_box, *m_label, *m_button; + Ypp::Log::Entry::Action m_action; + GtkWidget *getWidget() { return m_box; } + + LogEntry (Ypp::Package *package, Ypp::Log::Entry::Action action) + : m_action (action) + { + std::string label = action == Ypp::Log::Entry::INSTALL_ACTION ? + _("install") : _("remove"); + label += " " + package->name(); + m_label = gtk_label_new (label.c_str()); + gtk_misc_set_alignment (GTK_MISC (m_label), 0, 0.5); + gtk_label_set_ellipsize (GTK_LABEL (m_label), PANGO_ELLIPSIZE_END); + if (canUndo (package, action)) { + m_button = create_small_button (GTK_STOCK_UNDO, _("Undo")); + m_box = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (m_box), m_label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_box), m_button, FALSE, TRUE, 0); + g_signal_connect (G_OBJECT (m_button), "clicked", + G_CALLBACK (undo_clicked_cb), package); + } + else + m_box = m_label; + gtk_widget_show_all (m_box); + } + + static void undo_clicked_cb (GtkButton *button, Ypp::Package *package) + { +#if 0 + if (m_action == Ypp::Log::Entry::INSTALL_ACTION) + package->remove(); + else + package->install (0); +#endif + if (package->isInstalled()) + package->remove(); + else + package->install (0); + gtk_widget_hide (GTK_WIDGET (button)); + } + + static bool canUndo (Ypp::Package *package, Ypp::Log::Entry::Action action) + { + return (action == Ypp::Log::Entry::INSTALL_ACTION && package->isInstalled()) + || (action == Ypp::Log::Entry::REMOVE_ACTION && !package->isInstalled()); + } + }; + +GtkWidget *m_handle_box, *m_empty_label, *m_entries_box; Ypp::PkgList m_pool; GList *m_entries; public: GtkWidget *getWidget() - { return m_box; } + { return m_handle_box; } ChangesPane() : m_entries (NULL) { - GtkWidget *heading = gtk_label_new (_("Changes:")); + GtkWidget *heading = gtk_label_new (_("To perform now:")); YGUtils::setWidgetFont (heading, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); gtk_misc_set_alignment (GTK_MISC (heading), 0, 0.5); - m_entries_box = gtk_vbox_new (FALSE, 4); + m_entries_box = gtk_vbox_new (FALSE, 2); + + m_empty_label = gtk_label_new (_("Package changes will\nbe listed here.")); + YGUtils::setWidgetFont (m_empty_label, PANGO_STYLE_ITALIC, PANGO_WEIGHT_NORMAL, PANGO_SCALE_MEDIUM); + gtk_label_set_justify (GTK_LABEL (m_empty_label), GTK_JUSTIFY_CENTER); + gtk_misc_set_alignment (GTK_MISC (m_empty_label), 0.5, 0.5); + + GtkWidget *vbox = gtk_vbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); + gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), m_empty_label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), m_entries_box, TRUE, TRUE, 0); + + struct inner { + static gboolean expose_cb (GtkWidget *widget, GdkEventExpose *event) + { + cairo_t *cr = gdk_cairo_create (widget->window); + GdkColor color = { 0, 255 << 8, 255 << 8, 255 << 8 }; + gdk_cairo_set_source_color (cr, &color); + cairo_rectangle (cr, event->area.x, event->area.y, + event->area.width, event->area.height); + cairo_fill (cr); + cairo_destroy (cr); + return FALSE; + } + }; + g_signal_connect (G_OBJECT (vbox), "expose-event", + G_CALLBACK (inner::expose_cb), NULL); GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), - m_entries_box); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), vbox); GtkWidget *port = gtk_bin_get_child (GTK_BIN (scroll)); gtk_viewport_set_shadow_type (GTK_VIEWPORT (port), GTK_SHADOW_NONE); - GtkWidget *vbox = gtk_vbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); - gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0); - +/* ygtk_wizard_set_information_expose_hook (vbox, &vbox->allocation); ygtk_wizard_set_information_expose_hook (m_entries_box, &m_entries_box->allocation); - +*/ int width = YGUtils::getCharsWidth (vbox, 32); gtk_widget_set_size_request (vbox, width, -1); gtk_widget_show_all (vbox); - m_box = gtk_handle_box_new(); - gtk_container_add (GTK_CONTAINER (m_box), vbox); - gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (m_box), GTK_POS_TOP); - gtk_handle_box_set_snap_edge (GTK_HANDLE_BOX (m_box), GTK_POS_RIGHT); + GtkWidget *frame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (frame), scroll); + + m_handle_box = gtk_handle_box_new(); + gtk_container_add (GTK_CONTAINER (m_handle_box), frame); + gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (m_handle_box), GTK_POS_TOP); + gtk_handle_box_set_snap_edge (GTK_HANDLE_BOX (m_handle_box), GTK_POS_RIGHT); Ypp::QueryBase *query = new Ypp::QueryProperty ("to-modify", true); /* if (pkg_selector->onlineUpdateMode()) @@ -281,6 +389,25 @@ for (int i = 0; i < m_pool.size(); i++) ChangesPane::entryInserted (m_pool, i, m_pool.get (i)); m_pool.addListener (this); + + if (undo_log_all || undo_log_changed) { + GtkWidget *log_box = gtk_vbox_new (FALSE, 2); + GtkWidget *heading = gtk_label_new (_("Past changes:")); + YGUtils::setWidgetFont (heading, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_MEDIUM); + gtk_misc_set_alignment (GTK_MISC (heading), 0, 0.5); + gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), log_box, TRUE, TRUE, 0); + + for (int i = 0; Ypp::get()->getLog()->getEntry (i); i++) { + Ypp::Log::Entry *entry = Ypp::get()->getLog()->getEntry (i); + if (entry->package) + if (undo_log_all || LogEntry::canUndo (entry->package, entry->action)) { + // FIXME: free these stuff + LogEntry *log_entry = new LogEntry (entry->package, entry->action); + gtk_box_pack_start (GTK_BOX (log_box), log_entry->getWidget(), FALSE, TRUE, 0); + } + } + } } ~ChangesPane() @@ -293,6 +420,7 @@ void startHack() // call after init, after you did a show_all in the dialog { UpdateVisible(); + // ugly: signal modified for all entries to allow them to hide undo buttons GList *i; int index; @@ -303,8 +431,10 @@ void UpdateVisible() { - if (details_start_hide) - m_entries != NULL ? gtk_widget_show (m_box) : gtk_widget_hide (m_box); + if (details_start_hide && !(undo_log_all || undo_log_changed)) + m_entries ? gtk_widget_show (m_handle_box) : gtk_widget_hide (m_handle_box); + if (m_entries) + gtk_widget_hide (m_empty_label); } virtual void entryInserted (const Ypp::PkgList list, int index, Ypp::Package *package) @@ -3078,13 +3208,16 @@ GtkWidget *packages_pane = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (packages_pane), packages_button_box, TRUE, FALSE); + ChangesPane *changes_pane = 0; GtkWidget *undo_widget; if (undo_side) { - if (undo_old_style) - undo_widget = (new ChangesPane())->getWidget(); + if (undo_old_style) { + changes_pane = new ChangesPane(); + undo_widget = changes_pane->getWidget(); + } else undo_widget = undo_view->createView (this, false); - gtk_paned_pack2 (GTK_PANED (packages_pane), undo_widget, FALSE, FALSE); + gtk_paned_pack2 (GTK_PANED (packages_pane), undo_widget, FALSE, TRUE); gtk_paned_set_position (GTK_PANED (packages_pane), 350); } @@ -3167,15 +3300,14 @@ m_widget = vbox; gtk_widget_show_all (m_widget); - if (details_start_hide) { + if (details_start_hide) gtk_widget_hide (m_details->getWidget()); - if (undo_old_style) - gtk_widget_hide (undo_widget); - } else m_details->setPackage (NULL); if (!categories_side && !search_entry_side && !status_side) gtk_widget_hide (side_vbox); + if (changes_pane) + changes_pane->startHack(); } ~UI() Modified: trunk/gtk/src/pkg/ygtkpackageview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpackageview.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpackageview.cc (original) +++ trunk/gtk/src/pkg/ygtkpackageview.cc Thu Jan 7 01:36:18 2010 @@ -20,7 +20,7 @@ #include <string.h> extern bool status_col, action_col, action_col_as_button, action_col_as_check, - version_col, single_line_rows; + action_col_label, version_col, colorful_rows, single_line_rows; //** Icons resources @@ -116,8 +116,8 @@ TO_INSTALL_PROP, TO_UPGRADE_PROP, TO_REMOVE_PROP, TO_MODIFY_PROP, // internal STYLE_PROP, WEIGHT_PROP, SENSITIVE_PROP, CHECK_VISIBLE_PROP, - FOREGROUND_PROP, BACKGROUND_PROP, XPAD_PROP, - INSTALL_LABEL_PROP, REMOVE_LABEL_PROP, INSTALL_STOCK_PROP, REMOVE_STOCK_PROP, + FOREGROUND_PROP, VERSION_FOREGROUND_PROP, BACKGROUND_PROP, XPAD_PROP, + ACTION_LABEL_PROP, ACTION_STOCK_PROP, // misc PTR_PROP, TOTAL_PROPS }; @@ -136,11 +136,10 @@ case INSTALLED_VERSION_PROP: case AVAILABLE_VERSION_PROP: case FOREGROUND_PROP: + case VERSION_FOREGROUND_PROP: case BACKGROUND_PROP: - case INSTALL_LABEL_PROP: - case REMOVE_LABEL_PROP: - case INSTALL_STOCK_PROP: - case REMOVE_STOCK_PROP: + case ACTION_LABEL_PROP: + case ACTION_STOCK_PROP: return G_TYPE_STRING; case TO_INSTALL_PROP: case TO_UPGRADE_PROP: @@ -173,13 +172,12 @@ case SIZE_PROP: case INSTALLED_VERSION_PROP: case AVAILABLE_VERSION_PROP: - case INSTALL_LABEL_PROP: - case REMOVE_LABEL_PROP: - case INSTALL_STOCK_PROP: - case REMOVE_STOCK_PROP: + case ACTION_LABEL_PROP: + case ACTION_STOCK_PROP: g_value_set_string (value, g_strdup ("")); break; case FOREGROUND_PROP: + case VERSION_FOREGROUND_PROP: case BACKGROUND_PROP: g_value_set_string (value, NULL); break; @@ -412,12 +410,10 @@ g_value_set_boolean (value, modified); break; } - case INSTALL_LABEL_PROP: - case REMOVE_LABEL_PROP: + case ACTION_LABEL_PROP: g_value_set_string (value, g_strdup (_("All"))); break; - case INSTALL_STOCK_PROP: - case REMOVE_STOCK_PROP: + case ACTION_STOCK_PROP: g_value_set_string (value, g_strdup (GTK_STOCK_SELECT_ALL)); break; default: @@ -516,15 +512,32 @@ g_value_set_boolean (value, sensitive); break; } -/* case STYLE_PROP: { - PangoStyle style = PANGO_STYLE_NORMAL; - if (package->isAuto()) - style = PANGO_STYLE_ITALIC; - g_value_set_int (value, style); + if (colorful_rows) { + PangoStyle style = PANGO_STYLE_NORMAL; + if (package->isAuto()) + style = PANGO_STYLE_ITALIC; + g_value_set_int (value, style); + } + else + _getValueDefault (col, value); + break; + } + case VERSION_FOREGROUND_PROP: + case FOREGROUND_PROP: { + if (colorful_rows) { + const char *color = NULL; + if (!package->isInstalled()) + color = "darkgray"; + if (col == VERSION_FOREGROUND_PROP) + if (package->hasUpgrade()) + color = "blue"; + g_value_set_string (value, color); + } + else + _getValueDefault (col, value); break; } -*/ case WEIGHT_PROP: { bool highlight = segment->list.highlight (package); int weight = highlight ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL; @@ -536,35 +549,25 @@ g_value_set_int (value, xpad); break; } - case INSTALL_LABEL_PROP: { - const char *label = _("Add"); -/* if (package->toModify()) + case ACTION_LABEL_PROP: { + const char *label; + if (package->toModify()) label = _("Undo"); - else if (package->hasUpgrade()) - label = _("Upgrade");*/ - if (package->hasUpgrade()) - label = _("Upgrade"); - g_value_set_string (value, g_strdup (label)); - break; - } - case REMOVE_LABEL_PROP: { - const char *label = _("Remove"); -/* if (package->toModify()) - label = _("Undo");*/ + else if (package->isInstalled()) + label = _("Remove"); + else + label = _("Add"); g_value_set_string (value, g_strdup (label)); break; } - case INSTALL_STOCK_PROP: { - const char *stock = GTK_STOCK_ADD; -/* if (package->toModify()) - stock = GTK_STOCK_UNDO;*/ - g_value_set_string (value, g_strdup (stock)); - break; - } - case REMOVE_STOCK_PROP: { - const char *stock = GTK_STOCK_REMOVE; -/* if (package->toModify()) - stock = GTK_STOCK_UNDO;*/ + case ACTION_STOCK_PROP: { + const char *stock; + if (package->toModify()) + stock = GTK_STOCK_UNDO; + else if (package->isInstalled()) + stock = GTK_STOCK_REMOVE; + else + stock = GTK_STOCK_ADD; g_value_set_string (value, g_strdup (stock)); break; } @@ -891,49 +894,50 @@ void appendButtonColumn (const char *header, const std::string &prop) { - int modelCol = translateProperty (prop); - int labelCol, stockCol; - switch (modelCol) { - case TO_INSTALL_PROP: case TO_UPGRADE_PROP: default: - labelCol = INSTALL_LABEL_PROP; - stockCol = INSTALL_STOCK_PROP; - break; - case TO_REMOVE_PROP: - labelCol = REMOVE_LABEL_PROP; - stockCol = REMOVE_STOCK_PROP; - break; - } + int labelCol = ACTION_LABEL_PROP, stockCol = ACTION_STOCK_PROP; GtkTreeView *view = GTK_TREE_VIEW (m_view); GtkCellRenderer *renderer = ygtk_cell_renderer_button_new(); GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ( - header, renderer, "active", modelCol, + header, renderer,// "active", modelCol, "visible", CHECK_VISIBLE_PROP, "sensitive", SENSITIVE_PROP, "cell-background", BACKGROUND_PROP, - "text", labelCol, -// "stock-id", stockCol, NULL); + if (action_col_label) + gtk_tree_view_column_add_attribute (column, renderer, "text", labelCol); + gboolean button_images; + g_object_get (G_OBJECT (gtk_settings_get_default()), "gtk-button-images", &button_images, NULL); + bool show_icon = !action_col_label || button_images; + if (show_icon) + gtk_tree_view_column_add_attribute (column, renderer, "stock-id", stockCol); g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (renderer_toggled_cb), this); PangoRectangle rect; int width = 0; - const char *text[] = { _("Add"), _("Remove") }; - for (int i = 0; i < 2; i++) { - PangoLayout *layout = gtk_widget_create_pango_layout (m_view, text[i]); - pango_layout_get_pixel_extents (layout, NULL, &rect); - width = MAX (width, rect.width); - g_object_unref (G_OBJECT (layout)); + if (action_col_label) { + const char *text[] = { _("Add"), _("Remove") }; + for (int i = 0; i < 2; i++) { + PangoLayout *layout = gtk_widget_create_pango_layout (m_view, text[i]); + pango_layout_get_pixel_extents (layout, NULL, &rect); + width = MAX (width, rect.width); + g_object_unref (G_OBJECT (layout)); + } } width += 16; -// width += 20; // icon + if (show_icon) { + int icon_width; + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (m_view), + GTK_ICON_SIZE_MENU, &icon_width, NULL); + width += icon_width; + } gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_fixed_width (column, width); gtk_tree_view_append_column (view, column); - Action action = columnAction (modelCol); + Action action = columnAction (TO_INSTALL_PROP); g_object_set_data (G_OBJECT (renderer), "action", GINT_TO_POINTER (action)); if (m_activate_action == NONE_ACTION) m_activate_action = action; @@ -967,9 +971,12 @@ "sensitive", SENSITIVE_PROP, "style", STYLE_PROP, "weight", WEIGHT_PROP, - "foreground", FOREGROUND_PROP, "cell-background", BACKGROUND_PROP, NULL); + int foregroundCol = FOREGROUND_PROP; + if (col == AVAILABLE_VERSION_PROP) + foregroundCol = VERSION_FOREGROUND_PROP; + gtk_tree_view_column_add_attribute (column, renderer, "foreground", foregroundCol); g_object_set_data_full (G_OBJECT (column), "property", g_strdup (prop.c_str()), g_free); if (identAuto) gtk_tree_view_column_add_attribute (column, renderer, "xpad", XPAD_PROP); @@ -1166,15 +1173,18 @@ static void apply (Ypp::Package *package, Action action, bool enable) { - if (enable) + if (package->toModify()) + package->undo(); + else +// if (enable) switch (action) { case INSTALL_ACTION: package->install (0); break; case REMOVE_ACTION: package->remove(); break; case UNDO_ACTION: package->undo(); break; case NONE_ACTION: break; } - else - package->undo(); +/* else + package->undo();*/ } static gboolean apply_iter_cb (GtkTreeModel *model, Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Thu Jan 7 01:36:18 2010 @@ -1,10 +1,7 @@ /******************************************************************** * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ - -/* - Textdomain "yast2-gtk" - */ +/* Textdomain "yast2-gtk" */ /* Ypp, zypp wrapper */ // check the header file for information about this wrapper @@ -37,7 +34,6 @@ #include "YGUtils.h" //** Zypp shortcuts - typedef zypp::ResPoolProxy ZyppPool; inline ZyppPool zyppPool() { return zypp::getZYpp()->poolProxy(); } typedef zypp::ui::Selectable::Ptr ZyppSelectable; @@ -55,11 +51,10 @@ { return zypp::dynamic_pointer_cast <const zypp::Pattern> (obj); } //** Utilities - // converts a set of tree representation in a form of a strings to a tree structure. // String tree representations are, for instance, filenames: /dir1/dir2/file struct StringTree { - typedef int (*Compare)(const char *, const char *); + typedef int (* Compare)(const char *, const char *); Compare compare; char delim; const char *trans_domain; @@ -208,7 +203,6 @@ std::vector <Repository *> repos; const Repository *favoriteRepo; int favoriteRepoPriority; - Disk *disk; Interface *interface; GSList *pkg_listeners; bool inTransaction; @@ -2225,6 +2219,20 @@ } }; +//** Disk + +static Ypp::Disk *_disk; + +Ypp::Disk *Ypp::getDisk() +{ + if (!_disk) + _disk = new Disk(); + return _disk; +} + +void finish_disk() +{ delete _disk; _disk = 0; } + Ypp::Disk::Disk() { impl = new Impl(); } Ypp::Disk::~Disk() @@ -2244,6 +2252,8 @@ return NULL; } +//** Categories + Ypp::Node *Ypp::getFirstCategory2 (Ypp::Package::Type type) { impl->getPackages (type); @@ -2325,7 +2335,7 @@ //** Ypp top methods & internal connections Ypp::Impl::Impl() -: favoriteRepo (NULL), disk (NULL), interface (NULL), +: favoriteRepo (NULL), interface (NULL), pkg_listeners (NULL), inTransaction (false), transactions (NULL) { for (int i = 0; i < Package::TOTAL_TYPES; i++) { @@ -2355,7 +2365,6 @@ // don't delete pools as they don't actually belong to Ypp, just listeners g_slist_free (pkg_listeners); - delete disk; } const Ypp::Repository *Ypp::Impl::getRepository (int nb) @@ -2424,13 +2433,6 @@ return i; } -Ypp::Disk *Ypp::Impl::getDisk() -{ - if (!disk) - disk = new Disk(); - return disk; -} - bool Ypp::Impl::acceptLicense (Ypp::Package *package, const std::string &license) { if (interface) @@ -2582,11 +2584,132 @@ g_slist_free (transactions); transactions = NULL; inTransaction = false; - if (disk) - disk->impl->packageModified(); + if (_disk) + _disk->impl->packageModified(); interface->loading (1); } +//** Log + +#include <zypp/parser/HistoryLogReader.h> +typedef zypp::HistoryItem::Ptr ZyppHistoryItem; +typedef zypp::HistoryItemInstall *ZyppHistoryItemInstall; +typedef zypp::HistoryItemRemove *ZyppHistoryItemRemove; +inline ZyppHistoryItemInstall tryCastToZyppHistoryItemInstall (ZyppHistoryItem item) +{ return dynamic_cast <zypp::HistoryItemInstall *> (item.get()); } +inline ZyppHistoryItemRemove tryCastToZyppHistoryItemRemove (ZyppHistoryItem item) +{ return dynamic_cast <zypp::HistoryItemRemove *> (item.get()); } + +struct Ypp::Log::Impl +{ + std::vector <Log::Entry *> entries; + Impl(); + ~Impl(); + void parse (const ZyppHistoryItem &item); +}; + +struct HistoryParseHandler { + Ypp::Log::Impl *log; + HistoryParseHandler (Ypp::Log::Impl *log) : log (log) {} + + bool operator()(const ZyppHistoryItem &item) { + log->parse (item); + return true; + } +}; + +Ypp::Log::Impl::Impl() +{ + entries.reserve (512); + HistoryParseHandler handler (this); + const char *filename = "/var/log/zypp/history"; + zypp::parser::HistoryLogReader reader (filename, boost::ref (handler)); + try { + reader.readAll(); + } + catch (const zypp::Exception &e) { + yuiWarning () << "Error: Could not load log file" << filename << ": " + << e.asUserHistory() << std::endl; + } +} + +Ypp::Log::Impl::~Impl() +{ + for (std::vector <Log::Entry *>::iterator it = entries.begin(); + it != entries.end(); it++) + delete *it; +} + +void Ypp::Log::Impl::parse (const ZyppHistoryItem &item) +{ + Entry::Action action; + if (item->action.toEnum() == zypp::HistoryActionID::INSTALL_e) + action = Entry::INSTALL_ACTION; + else if (item->action.toEnum() == zypp::HistoryActionID::REMOVE_e) + action = Entry::REMOVE_ACTION; + else + return; + + Entry *entry = new Entry(); + entry->action = action; + entry->date = item->date; + if (action == Entry::INSTALL_ACTION) { + ZyppHistoryItemInstall _item = tryCastToZyppHistoryItemInstall (item); + if (_item) { + entry->package_str = _item->name; + entry->version_str = _item->edition.asString(); + } + } + else { + ZyppHistoryItemRemove _item = tryCastToZyppHistoryItemRemove (item); + if (_item) { + entry->package_str = _item->name; + entry->version_str = _item->edition.asString(); + } + } +//fprintf (stderr, "parse: %s\n", entry->package_str.c_str()); + entry->package = Ypp::get()->getPackages (Ypp::Package::PACKAGE_TYPE).find (entry->package_str); + entry->version = NULL; + if (entry->package) { + const Package::Version *version = entry->package->getInstalledVersion(); + if (version && version->number == entry->version_str) + entry->version = version; + for (int i = 0; entry->package->getAvailableVersion (i); i++) { + version = entry->package->getAvailableVersion (i); + if (version->number == entry->version_str) + entry->version = version; + } + } + entries.push_back (entry); +} + +Ypp::Log::Log() +{ impl = new Impl(); } + +Ypp::Log::~Log() +{ delete impl; } + +Ypp::Log::Entry *Ypp::Log::getEntry (int nb) +{ + if (nb >= (signed) impl->entries.size()) + return NULL; + return impl->entries[impl->entries.size()-nb-1]; // reverse order +} + +static Ypp::Log *_log = 0; + +Ypp::Log *Ypp::getLog() +{ + if (!_log) + _log = new Log(); + return _log; +} + +void finish_log() +{ delete _log; _log = 0; } + +//** Top + Ypp::Ypp() { impl = new Impl(); @@ -2599,6 +2722,8 @@ { setFavoriteRepository (NULL); delete impl; + finish_log(); + finish_disk(); } const Ypp::Repository *Ypp::getRepository (int nb) @@ -2623,9 +2748,6 @@ const Ypp::Repository *Ypp::favoriteRepository() { return impl->favoriteRepo; } -Ypp::Disk *Ypp::getDisk() -{ return impl->getDisk(); } - void Ypp::setInterface (Ypp::Interface *interface) { impl->interface = interface; Modified: trunk/gtk/src/pkg/yzyppwrapper.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.h?rev=6… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.h (original) +++ trunk/gtk/src/pkg/yzyppwrapper.h Thu Jan 7 01:36:18 2010 @@ -258,6 +258,29 @@ void *impl; }; + // Log + struct Log { + struct Entry { + enum Action { INSTALL_ACTION, REMOVE_ACTION }; + Action action; + std::string date; + std::string package_str; + std::string version_str; + + // attemps to match the strings: could be null + Package *package; + const Package::Version *version; // only may be set for INSTALL + }; + + Entry *getEntry (int nb); + + struct Impl; + Impl *impl; + Log(); + ~Log(); + }; + Log *getLog(); + // Module static Ypp *get(); static void finish(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60249 - in /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src: Storage.cc StorageDefines.h
by aschnell＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: aschnell Date: Wed Jan 6 20:18:01 2010 New Revision: 60249 URL: http://svn.opensuse.org/viewcvs/yast?rev=60249&view=rev Log: - added logging Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageDefines.h Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Wed Jan 6 20:18:01 2010 @@ -148,6 +148,8 @@ getline( File, line ); File.close(); y2mil( "kernel version:" << line ); + + SystemCmd(LSBIN " -1 /lib/modules"); } Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageDefines.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageDefines.h Wed Jan 6 20:18:01 2010 @@ -75,5 +75,7 @@ #define BLKIDBIN "/sbin/blkid" +#define LSBIN "/bin/ls" + #endif -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60248 - /tags/stable-2_19_0/pkg-bindings/
by lslezak＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: lslezak Date: Wed Jan 6 20:14:04 2010 New Revision: 60248 URL: http://svn.opensuse.org/viewcvs/yast?rev=60248&view=rev Log: Created tag stable-2_19_0 for pkg-bindings Added: tags/stable-2_19_0/pkg-bindings/ - copied from r60247, trunk/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60247 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Package.cc src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: lslezak Date: Wed Jan 6 20:13:58 2010 New Revision: 60247 URL: http://svn.opensuse.org/viewcvs/yast?rev=60247&view=rev Log: - Pkg::ResolvableProperties() - always return "transact_by" flag, Pkg::PkgApplReset() - do not reset "transact_by" flag for non-transacting resolvables (bnc#450786, bnc#471340) - 2.19.0 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=60247&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Wed Jan 6 20:13:58 2010 @@ -1 +1 @@ -2.18.11 +2.19.0 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Wed Jan 6 20:13:58 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 6 17:50:26 UTC 2010 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - always return "transact_by" flag, + Pkg::PkgApplReset() - do not reset "transact_by" flag for + non-transacting resolvables (bnc#450786, bnc#471340) +- 2.19.0 + +------------------------------------------------------------------- Thu Dec 3 08:19:45 UTC 2009 - lslezak(a)suse.cz - return more details when a service refresh fails (bnc#558049) Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Wed Jan 6 20:13:58 2010 @@ -1727,7 +1727,10 @@ for_(it, proxy.byKindBegin<T>(), proxy.byKindEnd<T>()) { zypp::ui::Selectable::Ptr s = (*it); - if (s) s->theObj().status().resetTransact(level); + if (s && (level == zypp::ResStatus::USER || s->theObj().status().transacts())) + { + s->theObj().status().resetTransact(level); + } } } Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Wed Jan 6 20:13:58 2010 @@ -193,14 +193,12 @@ if (status.isToBeInstalled()) { stat = "selected"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); } else if (status.isInstalled() || status.isSatisfied()) { if (status.isToBeUninstalled()) { stat = "removed"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); } else { @@ -212,6 +210,8 @@ stat = "available"; } + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + info->add(YCPString("status"), YCPSymbol(stat)); // is the resolvable locked? (Locked or Taboo in the UI) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60246 - /tags/stable-2_19_2/packager/
by lslezak＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: lslezak Date: Wed Jan 6 20:10:34 2010 New Revision: 60246 URL: http://svn.opensuse.org/viewcvs/yast?rev=60246&view=rev Log: Created tag stable-2_19_2 for packager Added: tags/stable-2_19_2/packager/ - copied from r60245, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60245 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: lslezak Date: Wed Jan 6 20:10:25 2010 New Revision: 60245 URL: http://svn.opensuse.org/viewcvs/yast?rev=60245&view=rev Log: - do not reselect patterns which have been deselected by user (bnc#450786, bnc#471340) - 2.19.2 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=60245&r1=60… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Jan 6 20:10:25 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Jan 6 20:10:25 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 6 17:48:18 UTC 2010 - lslezak(a)suse.cz + +- do not reselect patterns which have been deselected by user + (bnc#450786, bnc#471340) +- 2.19.2 + +------------------------------------------------------------------- Mon Jan 4 16:18:08 CET 2010 - locilka(a)suse.cz - Fixed accepting/declining the multilicense agreement. Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Jan 6 20:10:25 2010 @@ -1649,7 +1649,15 @@ { y2milestone ("Selecting system patterns %1", system_patterns); foreach (string p, system_patterns, { - Pkg::ResolvableInstall (p, `pattern); + map prop = Pkg::ResolvableProperties(p, `pattern, "")[0]:$[]; + if (prop["status"]:nil == `available && prop["transact_by"]:nil == `user) + { + y2milestone("Ignoring deselected pattern '%1'", p); + } + else + { + Pkg::ResolvableInstall (p, `pattern); + } }); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60244 - /tags/branch-Code-11-SP1-2_17_65/packager/
by lslezak＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: lslezak Date: Wed Jan 6 20:03:14 2010 New Revision: 60244 URL: http://svn.opensuse.org/viewcvs/yast?rev=60244&view=rev Log: Created tag branch-Code-11-SP1-2_17_65 for packager Added: tags/branch-Code-11-SP1-2_17_65/packager/ (props changed) - copied from r60243, branches/SuSE-Code-11-SP1-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60243 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: lslezak Date: Wed Jan 6 20:03:07 2010 New Revision: 60243 URL: http://svn.opensuse.org/viewcvs/yast?rev=60243&view=rev Log: - do not reselect patterns which have been deselected by user (bnc#450786, bnc#471340) - 2.17.65 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/Packages.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Wed Jan 6 20:03:07 2010 @@ -1 +1 @@ -2.17.64 +2.17.65 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Wed Jan 6 20:03:07 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 6 17:48:18 UTC 2010 - lslezak(a)suse.cz + +- do not reselect patterns which have been deselected by user + (bnc#450786, bnc#471340) +- 2.17.65 + ------------------------------------------------------------------ Mon Jan 4 16:18:08 CET 2010 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/Packages.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/Packages.ycp Wed Jan 6 20:03:07 2010 @@ -1649,7 +1649,15 @@ { y2milestone ("Selecting system patterns %1", system_patterns); foreach (string p, system_patterns, { - Pkg::ResolvableInstall (p, `pattern); + map prop = Pkg::ResolvableProperties(p, `pattern, "")[0]:$[]; + if (prop["status"]:nil == `available && prop["transact_by"]:nil == `user) + { + y2milestone("Ignoring deselected pattern '%1'", p); + } + else + { + Pkg::ResolvableInstall (p, `pattern); + } }); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60242 - /tags/branch-Code-11-SP1-2_17_42/pkg-bindings/
by lslezak＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: lslezak Date: Wed Jan 6 20:01:34 2010 New Revision: 60242 URL: http://svn.opensuse.org/viewcvs/yast?rev=60242&view=rev Log: Created tag branch-Code-11-SP1-2_17_42 for pkg-bindings Added: tags/branch-Code-11-SP1-2_17_42/pkg-bindings/ (props changed) - copied from r60241, branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60241 - /tags/branch-Code-11-SP1-2_17_42/
by lslezak＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: lslezak Date: Wed Jan 6 20:01:32 2010 New Revision: 60241 URL: http://svn.opensuse.org/viewcvs/yast?rev=60241&view=rev Log: Created tag branch-Code-11-SP1-2_17_42 Added: tags/branch-Code-11-SP1-2_17_42/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60240 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Package.cc src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: lslezak Date: Wed Jan 6 20:00:50 2010 New Revision: 60240 URL: http://svn.opensuse.org/viewcvs/yast?rev=60240&view=rev Log: - Pkg::ResolvableProperties() - always return "transact_by" flag, Pkg::PkgApplReset() - do not reset "transact_by" flag for non-transacting resolvables (bnc#450786, bnc#471340) - 2.17.42 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION Wed Jan 6 20:00:50 2010 @@ -1 +1 @@ -2.17.41 +2.17.42 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Wed Jan 6 20:00:50 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 6 17:50:26 UTC 2010 - lslezak(a)suse.cz + +- Pkg::ResolvableProperties() - always return "transact_by" flag, + Pkg::PkgApplReset() - do not reset "transact_by" flag for + non-transacting resolvables (bnc#450786, bnc#471340) +- 2.17.42 + +------------------------------------------------------------------- Tue Nov 17 12:52:06 UTC 2009 - dmacvicar(a)novell.com - fix Locks binding using YCP Map iterator API not existing on Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Package.cc Wed Jan 6 20:00:50 2010 @@ -1727,7 +1727,10 @@ for_(it, proxy.byKindBegin<T>(), proxy.byKindEnd<T>()) { zypp::ui::Selectable::Ptr s = (*it); - if (s) s->theObj().status().resetTransact(level); + if (s && (level == zypp::ResStatus::USER || s->theObj().status().transacts())) + { + s->theObj().status().resetTransact(level); + } } } Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Properties.cc Wed Jan 6 20:00:50 2010 @@ -184,14 +184,12 @@ if (status.isToBeInstalled()) { stat = "selected"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); } else if (status.isInstalled() || status.isSatisfied()) { if (status.isToBeUninstalled()) { stat = "removed"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); } else { @@ -203,6 +201,8 @@ stat = "available"; } + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + info->add(YCPString("status"), YCPSymbol(stat)); // is the resolvable locked? (Locked or Taboo in the UI) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60239 - /tags/stable-2_19_1/product-creator/
by jsuchome＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: jsuchome Date: Wed Jan 6 14:18:45 2010 New Revision: 60239 URL: http://svn.opensuse.org/viewcvs/yast?rev=60239&view=rev Log: Created tag stable-2_19_1 for product-creator Added: tags/stable-2_19_1/product-creator/ - copied from r60238, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60238 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/ProductCreator.ycp src/data/kiwi_templates/iso/config.xml src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 06 Jan '10

06 Jan '10

Author: jsuchome Date: Wed Jan 6 14:18:38 2010 New Revision: 60238 URL: http://svn.opensuse.org/viewcvs/yast?rev=60238&view=rev Log: - do not remove directory that can be resused (patch from varkoly, bnc#568298) - adapt to new paths of kiwi-config-openSUSE, changed template - 2.19.1 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp trunk/product-creator/src/data/kiwi_templates/iso/config.xml trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6023… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Jan 6 14:18:38 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Jan 6 14:18:38 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 6 13:52:43 CET 2010 - jsuchome(a)suse.cz + +- do not remove directory that can be resused (patch from varkoly, + bnc#568298) +- adapt to new paths of kiwi-config-openSUSE, changed template +- 2.19.1 + +------------------------------------------------------------------- Tue Dec 22 15:31:27 CET 2009 - jsuchome(a)suse.cz - use menubutton for both iso image and directory tree (bnc#438223) Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Wed Jan 6 14:18:38 2010 @@ -2814,7 +2814,7 @@ } else { - return false; + y2milestone("Directory %1 won't be removed", isodir); } } Modified: trunk/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_te… ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/config.xml Wed Jan 6 14:18:38 2010 @@ -1,28 +1,37 @@ <?xml version="1.0"?> -<image schemeversion="2.0" name="kiwi-image-template"> +<image schemeversion="2.4" name="kiwi-image-template"> <description type="system"> <author></author> <contact></contact> <specification>Template for system image configuration</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-11.1" flags="unified">iso</type> + <type primary="true" boot="isoboot/suse-11.2" bootprofile="default" bootkernel="desktop" flags="clic" hybrid="true">iso</type> <type boot="vmxboot/suse-11.1" filesystem="ext3" format="vmdk">vmx</type> <type boot="usbboot/suse-11.1" filesystem="ext3">usb</type> <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> <type boot="oemboot/suse-11.1" filesystem="ext3" flags="unified">oem</type> <version>1.0.0</version> - <size unit="M">2000</size> <packagemanager>zypper</packagemanager> - <rpm-check-signatures>False</rpm-check-signatures> - <rpm-force>False</rpm-force> + <size unit="M">3000</size> + <boot-theme>openSUSE</boot-theme> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>false</rpm-force> <locale>en_US.UTF-8</locale> + <oem-swap>false</oem-swap> + <oem-boot-title>USB</oem-boot-title> + <rpm-excludedocs>false</rpm-excludedocs> </preferences> <users group="users"> <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> <user name="root" pwd="" home="/root"/> </users> - <packages type="image" patternType="plusRecommended" patternPackageType="plusRecommended"> + <repository type="rpm-md"> + <source path="http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard/"/> + </repository> + <packages type="image" patternPackageType="onlyRequired"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="yast2-live-installer"/> <package name="pam"/> <package name="pam-config"/> @@ -33,52 +42,34 @@ <package name="patch"/> <package name="zypper"/>  - <package name="3ddiag"/> - <package name="915resolution"/> <package name="ConsoleKit"/> <package name="ConsoleKit-x11"/> + <package name="DeviceKit-disks"/> <package name="DirectFB"/> - <package name="IlmBase"/> - <package name="LibVNCServer"/> + <package name="ImageMagick"/> <package name="Mesa"/> - <package name="MozillaFirefox"/> - <package name="NetworkManager"/> - <package name="NetworkManager-glib"/> - <package name="NetworkManager-kde"/> - <package name="OpenEXR"/> - <package name="OpenOffice_org"/> - <package name="OpenOffice_org-Quickstarter"/> - <package name="OpenOffice_org-branding-openSUSE"/> - <package name="OpenOffice_org-calc"/> - <package name="OpenOffice_org-draw"/> - <package name="OpenOffice_org-icon-themes"/> - <package name="OpenOffice_org-impress"/> - <package name="OpenOffice_org-kde"/> - <package name="OpenOffice_org-templates-labels-a4"/> - <package name="OpenOffice_org-templates-labels-letter"/> - <package name="OpenOffice_org-writer"/> + <package name="MozillaSunbird"/> + <package name="MozillaSunbird-translations"/> <package name="PolicyKit"/> <package name="PolicyKit-doc"/> - <package name="PolicyKit-kde"/> - <package name="SDL"/> <package name="SuSEfirewall2"/> <package name="a2ps"/> <package name="aaa_base"/> - <package name="aalib"/> <package name="acl"/> + <package name="acpica"/> <package name="acpid"/> <package name="adaptec-firmware"/> - <package name="akonadi-runtime"/> <package name="alsa"/> + <package name="alsa-firmware"/> <package name="alsa-oss"/> + <package name="alsa-plugins"/> <package name="alsa-utils"/> - <package name="amarok"/> - <package name="amarok-libvisual"/> - <package name="amarok-yauap"/> <package name="apparmor-parser"/> <package name="apparmor-profiles"/> <package name="apparmor-utils"/> + <package name="aria2"/> <package name="aspell"/> + <package name="aspell-de"/> <package name="aspell-en"/> <package name="atk"/> <package name="atmel-firmware"/> @@ -86,91 +77,76 @@ <package name="audiofile"/> <package name="audit"/> <package name="audit-libs"/> + <package name="augeas-lenses"/> <package name="autofs"/> <package name="autoyast2-installation"/> - <package name="avahi"/> + <package name="awesfx"/> <package name="b43-fwcutter"/> <package name="bash"/> - <package name="bash-doc"/> <package name="bc"/> <package name="bind-libs"/> <package name="bind-utils"/> - <package name="binutils"/> - <package name="blktrace"/> <package name="bluez-firmware"/> - <package name="bluez-libs"/> - <package name="bluez-utils"/> <package name="bootsplash"/> <package name="bootsplash-branding-openSUSE"/> <package name="branding-openSUSE"/> + <package name="btrfsprogs"/> + <package name="bundle-lang-common-de"/> <package name="bundle-lang-common-en"/> - <package name="bundle-lang-kde-en"/> <package name="bzip2"/> <package name="cabextract"/> <package name="cairo"/> - <package name="cdparanoia"/> - <package name="cdrdao"/> <package name="cdrkit-cdrtools-compat"/> - <package name="check"/> <package name="checkmedia"/> - <package name="chmlib"/> <package name="cifs-mount"/> - <package name="clucene-core"/> - <package name="compiz"/> - <package name="compiz-fusion-plugins-main"/> - <package name="compiz-kde4"/> - <package name="compiz-manager"/> - <package name="compizconfig-settings-manager"/> + <package name="command-not-found"/> + <package name="compcache"/> + <package name="compcache-kmp-desktop"/> <package name="coreutils"/> <package name="cpio"/> <package name="cpp"/> - <package name="cpp43"/> + <package name="cpp44"/> <package name="cracklib"/> <package name="cracklib-dict-full"/> + <package name="crda"/> <package name="cron"/> <package name="cryptsetup"/> <package name="cups"/> <package name="cups-client"/> + <package name="cups-drivers"/> <package name="cups-libs"/> <package name="curl"/> <package name="cyrus-sasl"/> <package name="cyrus-sasl-crammd5"/> <package name="cyrus-sasl-digestmd5"/> + <package name="cyrus-sasl-gssapi"/> <package name="cyrus-sasl-plain"/> - <package name="cyrus-sasl-saslauthd"/> <package name="db-utils"/> <package name="dbus-1"/> <package name="dbus-1-glib"/> - <package name="dbus-1-qt3"/> <package name="dbus-1-x11"/> - <package name="dcraw"/> <package name="ddrescue"/> <package name="dejavu"/> <package name="deltarpm"/> <package name="desktop-data-openSUSE"/> <package name="desktop-file-utils"/> <package name="device-mapper"/> - <package name="dhcp"/> - <package name="dhcp-client"/> <package name="dhcpcd"/> <package name="dialog"/> <package name="diffutils"/> - <package name="digikam"/> - <package name="digikamimageplugins"/> <package name="dirmngr"/> + <package name="dmidecode"/> <package name="dmraid"/> <package name="dosfstools"/> <package name="dvb"/> - <package name="dvd+rw-tools"/> <package name="e2fsprogs"/> <package name="eject"/> - <package name="enchant"/> + <package name="elfutils"/> + <package name="esound-daemon"/> + <package name="espeak"/> <package name="ethtool"/> - <package name="expat"/> - <package name="extragear-plasma"/> <package name="fam"/> <package name="fbset"/> - <package name="fftw3"/> <package name="file"/> <package name="filesystem"/> <package name="fillup"/> @@ -183,65 +159,53 @@ <package name="fuse"/> <package name="gawk"/> <package name="gconf2"/> - <package name="gconf2-branding-openSUSE"/> - <package name="gdb"/> + <package name="gd"/> <package name="gdbm"/> <package name="genisoimage"/> <package name="gettext-runtime"/> <package name="gfxboot"/> <package name="gfxboot-branding-openSUSE"/> - <package name="ggz"/> - <package name="ggz-client-libs"/> <package name="ghostscript-fonts-std"/> <package name="ghostscript-library"/> - <package name="ghostscript-omni"/> <package name="ghostscript-x11"/> - <package name="giflib"/> <package name="glib2"/> <package name="glib2-branding-openSUSE"/> <package name="glibc"/> + <package name="glibc-32bit"/> <package name="glibc-locale"/> - <package name="glitz"/> - <package name="gmp"/> - <package name="gnokii"/> + <package name="glibc-locale-32bit"/> + <package name="gnome-icon-theme"/> <package name="gnome-keyring"/> <package name="gnome-vfs2"/> <package name="gnutls"/> <package name="gpart"/> <package name="gpg2"/> - <package name="gpgme"/> <package name="gpm"/> <package name="grep"/> <package name="groff"/> <package name="grub"/> - <package name="gstreamer-0_10"/> - <package name="gstreamer-0_10-plugins-base"/> - <package name="gstreamer-0_10-plugins-good"/> <package name="gtk2"/> <package name="gtk2-branding-openSUSE"/> + <package name="gtk2-engine-murrine"/> <package name="gtk2-engines"/> - <package name="gtk2-theme-openSUSE"/> + <package name="gtk2-metatheme-gilouche"/> + <package name="gtk2-metatheme-sonar"/> <package name="gvfs"/> <package name="gvfs-backends"/> <package name="gvfs-fuse"/> <package name="gzip"/> <package name="hal"/> - <package name="hal-palm"/> - <package name="hal-resmgr"/> <package name="hdparm"/> <package name="hicolor-icon-theme"/> - <package name="hunspell"/> - <package name="hunspell-tools"/> <package name="hwinfo"/> <package name="icedax"/> <package name="icewm"/> <package name="icewm-lite"/> <package name="ifnteuro"/> <package name="ifplugd"/> - <package name="imlib2"/> - <package name="imlib2-loaders"/> <package name="info"/> <package name="info2html"/> + <package name="initviocons"/> <package name="input-utils"/> <package name="insserv"/> <package name="iproute2"/> @@ -249,359 +213,293 @@ <package name="iputils"/> <package name="ipw-firmware"/> <package name="irda"/> - <package name="iwl3945-ucode"/> - <package name="iwl4965-ucode"/> + <package name="irqbalance"/> + <package name="iw"/> <package name="jfsutils"/> - <package name="jpackage-utils"/> - <package name="jpeg"/> - <package name="k3b"/> - <package name="kaffeine"/> <package name="kbd"/> - <package name="kde4-akregator"/> - <package name="kde4-ark"/> - <package name="kde4-dolphin"/> - <package name="kde4-filesystem"/> - <package name="kde4-gwenview"/> - <package name="kde4-kaddressbook"/> - <package name="kde4-kcalc"/> - <package name="kde4-kcm_gtk"/> - <package name="kde4-kcolorchooser"/> - <package name="kde4-kdm"/> - <package name="kde4-kdm-branding-openSUSE"/> - <package name="kde4-kdnssd"/> - <package name="kde4-keditbookmarks"/> - <package name="kde4-kfind"/> - <package name="kde4-kgamma"/> - <package name="kde4-kget"/> - <package name="kde4-kgpg"/> - <package name="kde4-kio_audiocd"/> - <package name="kde4-kio_iso"/> - <package name="kde4-kio_kamera"/> - <package name="kde4-kio_sysinfo"/> - <package name="kde4-kio_sysinfo-branding-openSUSE"/> - <package name="kde4-kmahjongg"/> - <package name="kde4-kmail"/> - <package name="kde4-kmines"/> - <package name="kde4-kmix"/> - <package name="kde4-knewsticker"/> - <package name="kde4-knotes"/> - <package name="kde4-konqueror"/> - <package name="kde4-konqueror-plugins"/> - <package name="kde4-konsole"/> - <package name="kde4-kontact"/> - <package name="kde4-kopete"/> - <package name="kde4-korganizer"/> - <package name="kde4-kpat"/> - <package name="kde4-kpilot"/> - <package name="kde4-krdc"/> - <package name="kde4-kreversi"/> - <package name="kde4-krfb"/> - <package name="kde4-kscd"/> - <package name="kde4-ksnapshot"/> - <package name="kde4-ksudoku"/> - <package name="kde4-kwalletmanager"/> - <package name="kde4-kwin"/> - <package name="kde4-kwrite"/> - <package name="kde4-okular"/> - <package name="kde4-opensuse-updater"/> - <package name="kdeartwork4-screensaver"/> - <package name="kdebase3-runtime"/> - <package name="kdebase4"/> - <package name="kdebase4-libkonq"/> - <package name="kdebase4-nsplugin"/> - <package name="kdebase4-openSUSE"/> - <package name="kdebase4-openSUSE-lang"/> - <package name="kdebase4-runtime"/> - <package name="kdebase4-session"/> - <package name="kdebase4-workspace"/> - <package name="kdebase4-workspace-branding-openSUSE"/> - <package name="kdebase4-workspace-plasmoids"/> - <package name="kdebluetooth"/> - <package name="kdegames4"/> - <package name="kdegames4-carddecks-default"/> - <package name="kdelibs3"/> - <package name="kdelibs3-default-style"/> - <package name="kdelibs4"/> - <package name="kdelibs4-core"/> - <package name="kdemultimedia4"/> - <package name="kdepim3"/> - <package name="kdepim4"/> - <package name="kdepim4-wizards"/> - <package name="kdepimlibs4"/> - <package name="kdetv"/> - <package name="kernel-default"/> + <package name="kernel-desktop"/> + <package name="kernel-firmware"/> + <package name="keyutils"/> <package name="keyutils-libs"/> - <package name="kinternet"/> - <package name="kipi-plugins"/> <package name="klogd"/> - <package name="konversation"/> <package name="kpartx"/> - <package name="kpowersave"/> <package name="krb5"/> <package name="krb5-client"/> - <package name="krecord"/> - <package name="kscpm"/> - <package name="ktorrent"/> - <package name="ldapcpplib"/> + <package name="lcms"/> <package name="less"/> - <package name="libFLAC++6"/> <package name="libFLAC8"/> + <package name="libHX18"/> + <package name="libMagickCore2"/> + <package name="libMagickWand2"/> + <package name="libSDL-1_2-0"/> <package name="libacl"/> + <package name="libadns1"/> <package name="libaio"/> - <package name="libakonadi4"/> - <package name="libakonadiprotocolinternals0"/> - <package name="libao"/> <package name="libapparmor1"/> <package name="libarchive2"/> <package name="libart_lgpl"/> + <package name="libasm1"/> <package name="libasound2"/> + <package name="libatasmart4"/> <package name="libatk-1_0-0"/> <package name="libattr"/> + <package name="libaugeas0"/> <package name="libavahi-client3"/> <package name="libavahi-common3"/> - <package name="libavahi-core5"/> <package name="libavahi-glib1"/> <package name="libblkid1"/> <package name="libblocxx6"/> + <package name="libbluetooth3"/> <package name="libbonobo"/> + <package name="libbonoboui"/> + <package name="libbonoboui-lang"/> <package name="libbz2-1"/> <package name="libcap2"/> - <package name="libcdio7"/> + <package name="libcdio10"/> + <package name="libcdio_cdda0"/> + <package name="libcdio_paranoia0"/> + <package name="libcloog0"/> <package name="libcom_err2"/> - <package name="libcompizconfig"/> + <package name="libcryptsetup0"/> <package name="libcurl4"/> <package name="libdaemon0"/> <package name="libdb-4_5"/> - <package name="libdbus-1-qt3-0"/> - <package name="libdjvulibre15"/> <package name="libdns_sd"/> <package name="libdrm"/> - <package name="libdvdread3"/> - <package name="libenchant1"/> + <package name="libdw1"/> + <package name="libeggdbus-1-0"/> + <package name="libelf1"/> + <package name="liberation-fonts"/> <package name="libesd0"/> - <package name="libevent"/> + <package name="libevent-1_4-2"/> <package name="libexif"/> - <package name="libexiv2-2"/> <package name="libexpat1"/> <package name="libext2fs2"/> + <package name="libfprint0"/> + <package name="libfreebl3"/> <package name="libfuse2"/> - <package name="libgcc43"/> + <package name="libgcc44"/> <package name="libgcrypt11"/> - <package name="libggz2"/> + <package name="libgdu0"/> <package name="libgimpprint"/> <package name="libgio-2_0-0"/> <package name="libgio-fam"/> <package name="libglade2"/> <package name="libglib-2_0-0"/> <package name="libgmodule-2_0-0"/> + <package name="libgmp3"/> + <package name="libgmpxx4"/> <package name="libgnome"/> - <package name="libgnutls-extra26"/> + <package name="libgnomecanvas"/> + <package name="libgnomecanvas-lang"/> + <package name="libgnomeui"/> + <package name="libgnomeui-lang"/> <package name="libgnutls26"/> <package name="libgobject-2_0-0"/> + <package name="libgomp44"/> <package name="libgpg-error0"/> - <package name="libgpgme11"/> <package name="libgphoto2"/> - <package name="libgpod-tools"/> - <package name="libgpod3"/> - <package name="libgsf-1-114"/> <package name="libgssglue1"/> - <package name="libgstinterfaces-0_10-0"/> - <package name="libgstreamer-0_10-0"/> <package name="libgthread-2_0-0"/> + <package name="libgudev-1_0-0"/> <package name="libgvfscommon0"/> - <package name="libical0"/> - <package name="libicu"/> <package name="libidl"/> <package name="libidn"/> + <package name="libiw30"/> <package name="libjasper"/> <package name="libjpeg"/> - <package name="libkcal"/> - <package name="libkcal2"/> - <package name="libkcddb4"/> - <package name="libkcompactdisc4"/> - <package name="libkdcraw3"/> - <package name="libkde4"/> - <package name="libkdecore4"/> - <package name="libkdegames4"/> - <package name="libkdepim4"/> - <package name="libkdepimlibs4"/> - <package name="libkexiv2-3"/> - <package name="libkipi0"/> - <package name="libkonq4"/> <package name="libksba"/> - <package name="libktnef1"/> - <package name="liblazy1"/> <package name="liblcms1"/> - <package name="libltdl-3"/> + <package name="libldap-2_4-2"/> + <package name="libldapcpp1"/> + <package name="libltdl7"/> + <package name="liblua5_1"/> + <package name="liblzma0"/> + <package name="liblzo2-2"/> <package name="libmng"/> - <package name="libmpcdec5"/> <package name="libmpfr1"/> - <package name="libmtp7"/> - <package name="libmusicbrainz4"/> + <package name="libmysqlclient_r16"/> <package name="libncurses5"/> - <package name="libneon27"/> + <package name="libncurses5-32bit"/> + <package name="libncurses6"/> <package name="libnetpbm10"/> - <package name="libnjb"/> - <package name="libnjb5"/> <package name="libnl"/> <package name="libnscd"/> - <package name="libofa0"/> + <package name="libnsssharedhelper0"/> + <package name="libnuma1"/> <package name="libogg0"/> - <package name="liboil"/> <package name="libopenct1"/> <package name="libopensc2"/> <package name="libopenssl0_9_8"/> - <package name="libpcap"/> - <package name="libpisock9"/> + <package name="libpcap1"/> + <package name="libpciaccess0"/> + <package name="libpcre0"/> + <package name="libpixman-1-0"/> <package name="libpng12-0"/> - <package name="libpoppler-qt4-3"/> - <package name="libpoppler3"/> - <package name="libqca2"/> - <package name="libqimageblitz4"/> + <package name="libpolkit0"/> + <package name="libpoppler5"/> + <package name="libpopt0"/> + <package name="libppl7"/> + <package name="libppl_c2"/> + <package name="libproxy0"/> + <package name="libproxy0-config-gnome"/> + <package name="libproxy0-pacrunner-mozjs"/> + <package name="libproxy0-wpad-dns"/> + <package name="libpth20"/> + <package name="libpulse0"/> + <package name="libpython2_6-1_0"/> <package name="libqt4"/> <package name="libqt4-qt3support"/> <package name="libqt4-sql"/> + <package name="libqt4-sql-mysql"/> <package name="libqt4-x11"/> - <package name="libraptor1"/> - <package name="librasqal0"/> - <package name="libreadline5"/> - <package name="libredland0"/> + <package name="libreadline6"/> <package name="libreiserfs"/> <package name="librpcsecgss"/> - <package name="libsamplerate"/> + <package name="libselinux1"/> <package name="libsmbclient0"/> <package name="libsmbios-bin"/> - <package name="libsmbios-libs"/> + <package name="libsmbios2"/> <package name="libsndfile"/> - <package name="libsoprano4"/> - <package name="libsoup"/> <package name="libsoup-2_4-1"/> - <package name="libspeex"/> <package name="libsqlite3-0"/> - <package name="libstdc++43"/> - <package name="libstrigi0"/> + <package name="libstdc++44"/> + <package name="libstorage"/> <package name="libtalloc1"/> <package name="libtasn1"/> <package name="libtasn1-3"/> - <package name="libtdb0"/> - <package name="libtheora0"/> - <package name="libthinkfinger"/> + <package name="libtdb1"/> <package name="libtiff3"/> - <package name="libtunepimp"/> - <package name="libtunepimp5"/> - <package name="libusb"/> + <package name="libtirpc1"/> + <package name="libudev0"/> + <package name="libusb-0_1-4"/> + <package name="libusb-1_0-0"/> <package name="libuuid1"/> - <package name="libvisual"/> - <package name="libvisual-plugins"/> - <package name="libvolume_id"/> <package name="libvorbis"/> - <package name="libwavpack1"/> <package name="libwbclient0"/> - <package name="libwpd-0_8-8"/> - <package name="libwpg-0_1-1"/> - <package name="libwps-0_1-1"/> <package name="libx86"/> + <package name="libx86emu1"/> <package name="libxcrypt"/> - <package name="libxklavier"/> - <package name="libxklavier12"/> <package name="libxml2"/> - <package name="libxslt"/> <package name="libzio"/> - <package name="libzip1"/> <package name="libzypp"/> <package name="licenses"/> - <package name="lilo"/> <package name="limal"/> + <package name="limal-ca-mgm"/> + <package name="limal-ca-mgm-perl"/> + <package name="limal-nfs-server"/> + <package name="limal-nfs-server-perl"/> <package name="limal-perl"/> <package name="linux-atm-lib"/> + <package name="linux32"/> <package name="login"/> <package name="logrotate"/> <package name="lomoco"/> + <package name="lsb-release"/> + <package name="lsof"/> + <package name="lsscsi"/> <package name="lukemftp"/> <package name="lvm2"/> - <package name="lzo"/> <package name="mailx"/> <package name="man"/> + <package name="manufacturer-PPDs"/> <package name="master-boot-code"/> + <package name="mc"/> <package name="mdadm"/> <package name="memtest86+"/> + <package name="mhash"/> <package name="microcode_ctl"/> <package name="mingetty"/> <package name="mkinitrd"/> <package name="module-init-tools"/> <package name="mozilla-nspr"/> <package name="mozilla-nss"/> - <package name="mozilla-xulrunner190"/> - <package name="mozilla-xulrunner190-gnomevfs"/> - <package name="mozilla-xulrunner190-translations"/> <package name="mpt-firmware"/> - <package name="myspell-american"/> + <package name="mtools"/> + <package name="multipath-tools"/> + <package name="nano"/> <package name="ncurses-utils"/> <package name="ndiswrapper"/> - <package name="ndiswrapper-kmp-default"/> + <package name="ndiswrapper-kmp-desktop"/> <package name="net-tools"/> <package name="netcat"/> <package name="netcfg"/> <package name="netpbm"/> <package name="nfs-client"/> <package name="nfsidmap"/> - <package name="nscd"/> - <package name="nss-mdns"/> <package name="nss_ldap"/> <package name="ntfs-3g"/> <package name="ntfsprogs"/> <package name="ntp"/> + <package name="numactl"/> <package name="numlockx"/> <package name="obex-data-server"/> - <package name="obexftp"/> + <package name="openSUSE-build-key"/> <package name="openSUSE-release"/> - <package name="openct"/> <package name="openldap2-client"/> <package name="openobex"/> - <package name="opensc"/> <package name="openslp"/> <package name="openssh"/> <package name="openssh-askpass"/> <package name="openssl"/> <package name="openssl-certs"/> - <package name="opensuse-codecs-installer"/> + <package name="opensuse-manuals_en"/> <package name="orbit2"/> - <package name="oxygen-icon-theme"/> <package name="pam"/> <package name="pam-config"/> <package name="pam-modules"/> + <package name="pam_apparmor"/> + <package name="pam_fp"/> <package name="pam_krb5"/> <package name="pam_ldap"/> - <package name="pam_thinkfinger"/> + <package name="pam_mount"/> <package name="pango"/> <package name="parted"/> + <package name="patterns-openSUSE-apparmor"/> + <package name="patterns-openSUSE-base"/> + <package name="patterns-openSUSE-enhanced_base"/> + <package name="patterns-openSUSE-fonts"/> + <package name="patterns-openSUSE-sw_management"/> + <package name="patterns-openSUSE-x11"/> + <package name="patterns-openSUSE-x11_yast"/> + <package name="patterns-openSUSE-yast2_basis"/> + <package name="patterns-openSUSE-yast2_install_wf"/> <package name="pciutils"/> <package name="pciutils-ids"/> <package name="pcmciautils"/> <package name="pcre"/> - <package name="pcsc-lite"/> <package name="perl"/> <package name="perl-Bootloader"/> + <package name="perl-Business-ISBN"/> + <package name="perl-Business-ISBN-Data"/> <package name="perl-Config-Crontab"/> <package name="perl-Crypt-SSLeay"/> <package name="perl-Crypt-SmbHash"/> <package name="perl-DBD-SQLite"/> <package name="perl-DBI"/> + <package name="perl-Digest-HMAC"/> <package name="perl-Digest-MD4"/> <package name="perl-Digest-SHA1"/> <package name="perl-File-Tail"/> + <package name="perl-GD"/> + <package name="perl-GD-Barcode"/> <package name="perl-HTML-Parser"/> <package name="perl-HTML-Tagset"/> <package name="perl-Net-Daemon"/> + <package name="perl-NetxAP"/> <package name="perl-Parse-RecDescent"/> <package name="perl-PlRPC"/> <package name="perl-RPC-XML"/> <package name="perl-TermReadKey"/> <package name="perl-TimeDate"/> <package name="perl-URI"/> + <package name="perl-WWW-Curl"/> <package name="perl-X500-DN"/> - <package name="perl-XML-Bare"/> + <package name="perl-XML-LibXML"/> + <package name="perl-XML-LibXML-Common"/> + <package name="perl-XML-NamespaceSupport"/> <package name="perl-XML-Parser"/> + <package name="perl-XML-SAX"/> <package name="perl-XML-Simple"/> <package name="perl-XML-Writer"/> <package name="perl-XML-XPath"/> @@ -611,43 +509,35 @@ <package name="perl-libwww-perl"/> <package name="permissions"/> <package name="pinentry"/> - <package name="pinentry-qt"/> <package name="pkg-config"/> - <package name="plasma-theme-aya"/> + <package name="pm-profiler"/> <package name="pm-utils"/> - <package name="pmtools"/> - <package name="poppler-data"/> + <package name="polkit"/> + <package name="polkit-default-privs"/> <package name="poppler-tools"/> - <package name="popt"/> - <package name="portmap"/> <package name="postfix"/> - <package name="powersave"/> - <package name="powersave-libs"/> <package name="ppp"/> <package name="pptp"/> <package name="preload"/> + <package name="preload-kmp-desktop"/> <package name="procps"/> <package name="psmisc"/> - <package name="pth"/> + <package name="pullin-flash-player"/> + <package name="pullin-msttf-fonts"/> <package name="pwdutils"/> <package name="python"/> - <package name="python-cairo"/> - <package name="python-compizconfig"/> - <package name="python-gobject2"/> - <package name="python-gtk"/> - <package name="python-numeric"/> + <package name="python-base"/> + <package name="python-satsolver"/> <package name="python-xml"/> - <package name="qlogic-firmware"/> - <package name="qt3"/> - <package name="qtcurve-gtk2"/> - <package name="qtcurve-kde"/> <package name="quota"/> <package name="recode"/> <package name="reiserfs"/> <package name="release-notes-openSUSE"/> - <package name="resmgr"/> + <package name="rpcbind"/> <package name="rpm"/> - <package name="ruby"/> + <package name="rpm-python"/> + <package name="rsync"/> + <package name="rsyslog"/> <package name="satsolver-tools"/> <package name="sax2"/> <package name="sax2-gui"/> @@ -655,75 +545,65 @@ <package name="sax2-libsax"/> <package name="sax2-libsax-perl"/> <package name="sax2-tools"/> + <package name="sbl"/> + <package name="scout"/> <package name="scpm"/> - <package name="scsi"/> <package name="sed"/> <package name="setserial"/> + <package name="sg3_utils"/> <package name="shared-mime-info"/> - <package name="siga"/> - <package name="simple-ccsm"/> <package name="slang"/> + <package name="smartmontools"/> + <package name="smp_utils"/> <package name="smpppd"/> - <package name="soprano"/> <package name="splashy"/> - <package name="sqlite2"/> - <package name="sqlite3"/> - <package name="startup-notification"/> + <package name="splashy-branding-openSUSE"/> <package name="strace"/> - <package name="strigi"/> <package name="sudo"/> - <package name="sumf"/> - <package name="suse-build-key"/> <package name="suseRegister"/> <package name="susehelp"/> + <package name="susehelp_de"/> <package name="susehelp_en"/> <package name="suspend"/> <package name="sysconfig"/> <package name="sysfsutils"/> - <package name="syslog-ng"/> + <package name="systemtap-runtime"/> <package name="sysvinit"/> - <package name="taglib"/> <package name="tar"/> <package name="tcpd"/> <package name="terminfo-base"/> <package name="tightvnc"/> <package name="timezone"/> <package name="translation-update"/> + <package name="translation-update-de"/> <package name="udev"/> <package name="ulimit"/> + <package name="unrar"/> + <package name="unscd"/> <package name="unzip"/> <package name="update-alternatives"/> + <package name="usbutils"/> <package name="utempter"/> <package name="util-linux"/> - <package name="uuid-runtime"/> - <package name="v4l-conf"/> <package name="vim"/> <package name="vim-base"/> - <package name="vorbis-tools"/> + <package name="virtualbox-ose-kmp-desktop"/> <package name="w3m"/> <package name="wdiff"/> <package name="wget"/> + <package name="wireless-regdb"/> <package name="wireless-tools"/> - <package name="wlan-ng-kmp-default"/> <package name="wodim"/> <package name="wpa_supplicant"/> <package name="wvdial"/> <package name="wvstreams"/> <package name="x11-input-fujitsu"/> - <package name="x11-input-synaptics"/> <package name="x11-input-wacom"/> - <package name="x11-input-wacom-tools"/> <package name="x11-tools"/> - <package name="xalan-j2"/> - <package name="xaw3d"/> <package name="xdg-menu"/> <package name="xdg-utils"/> - <package name="xerces-j2"/> - <package name="xerces-j2-xml-apis"/> + <package name="xfsdump"/> <package name="xfsprogs"/> - <package name="xgl"/> - <package name="xgl-hardware-list"/> - <package name="xine-lib"/> <package name="xinetd"/> <package name="xkeyboard-config"/> <package name="xorg-x11"/> @@ -731,7 +611,6 @@ <package name="xorg-x11-driver-input"/> <package name="xorg-x11-driver-video"/> <package name="xorg-x11-driver-video-radeonhd"/> - <package name="xorg-x11-driver-video-unichrome"/> <package name="xorg-x11-driver-virtualbox-ose"/> <package name="xorg-x11-fonts-core"/> <package name="xorg-x11-libICE"/> @@ -754,19 +633,22 @@ <package name="xorg-x11-libxcb"/> <package name="xorg-x11-libxkbfile"/> <package name="xorg-x11-server"/> + <package name="xorg-x11-xauth"/> <package name="xstroke"/> <package name="xterm"/> - <package name="xvkbd"/> + <package name="xz"/> <package name="yast2"/> <package name="yast2-add-on"/> <package name="yast2-apparmor"/> <package name="yast2-backup"/> <package name="yast2-bootloader"/> + <package name="yast2-branding-openSUSE"/> <package name="yast2-control-center"/> <package name="yast2-control-center-qt"/> <package name="yast2-core"/> <package name="yast2-country"/> <package name="yast2-country-data"/> + <package name="yast2-dbus-client"/> <package name="yast2-fingerprint-reader"/> <package name="yast2-firewall"/> <package name="yast2-hardware-detection"/> @@ -785,11 +667,13 @@ <package name="yast2-ncurses-pkg"/> <package name="yast2-network"/> <package name="yast2-nfs-client"/> + <package name="yast2-nfs-common"/> <package name="yast2-nis-client"/> <package name="yast2-ntp-client"/> <package name="yast2-online-update"/> <package name="yast2-online-update-frontend"/> <package name="yast2-packager"/> + <package name="yast2-packager-webpin"/> <package name="yast2-pam"/> <package name="yast2-perl-bindings"/> <package name="yast2-pkg-bindings"/> @@ -798,6 +682,7 @@ <package name="yast2-qt"/> <package name="yast2-qt-pkg"/> <package name="yast2-registration"/> + <package name="yast2-registration-branding-openSUSE"/> <package name="yast2-repair"/> <package name="yast2-restore"/> <package name="yast2-runlevel"/> @@ -808,12 +693,10 @@ <package name="yast2-slp"/> <package name="yast2-sound"/> <package name="yast2-storage"/> - <package name="yast2-storage-lib"/> <package name="yast2-sudo"/> - <package name="yast2-support"/> <package name="yast2-sysconfig"/> <package name="yast2-theme-openSUSE"/> - <package name="yast2-theme-openSUSE-Oxygen"/> + <package name="yast2-trans-de"/> <package name="yast2-trans-en_US"/> <package name="yast2-trans-stats"/> <package name="yast2-transfer"/> @@ -821,25 +704,24 @@ <package name="yast2-tv"/> <package name="yast2-update"/> <package name="yast2-users"/> + <package name="yast2-vm"/> <package name="yast2-x11"/> <package name="yast2-xml"/> <package name="yast2-ycp-ui-bindings"/> - <package name="yauap"/> <package name="yp-tools"/> <package name="ypbind"/> <package name="zd1211-firmware"/> + <package name="zip"/> <package name="zisofs-tools"/> <package name="zlib"/> - <package name="zvbi"/> <package name="zypper"/>  </packages> <packages type="bootstrap"> <package name="filesystem"/> - <package name="glibc-locale"/> - <package name="kernel-default"/> - <package name="udev"/> <package name="bundle-lang-common-en"/> + <package name="openSUSE-release"/> + <package name="openSUSE-release-livecd-x11"/> </packages> <split> <temporary> Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Jan 6 14:18:38 2010 @@ -1132,11 +1132,8 @@ kiwi_task = Kiwi::kiwi_task; - // path to definition of openSUSE live CD (used if kiwi-config-openSUSE-kde, - // resp. kiwi-config-openSUSE-gnome is installed) - string kiwi_dir = "/usr/share/openSUSE/kiwi-config-kde"; - if (!FileUtils::Exists (kiwi_dir)) - kiwi_dir = "/usr/share/openSUSE/kiwi-config-gnome"; + // path to definition of openSUSE live CD (used if kiwi-config-openSUSE is installed) + string kiwi_dir = "/usr/share/openSUSE-kiwi/livecd-x11"; // read the information from the base product integer src_id = ProductCreator::checkProductDependency (); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60237 - in /trunk: autoinstallation/ autoinstallation/src/modules/ storage/package/ storage/storage/src/include/ storage/storage/src/modules/
by aschnell＠svn.opensuse.org 05 Jan '10

05 Jan '10

Author: aschnell Date: Tue Jan 5 17:07:41 2010 New Revision: 60237 URL: http://svn.opensuse.org/viewcvs/yast?rev=60237&view=rev Log: - removed unused parameter from function Storage::DeleteDevice Modified: trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/src/modules/AutoinstLVM.ycp trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/include/ep-nfs.ycp trunk/storage/storage/src/include/lvm_ui_dialogs.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.… ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Tue Jan 5 17:07:41 2010 @@ -8,6 +8,7 @@ BuildRequires: yast2 >= 2.16.36 # After API cleanup BuildRequires: yast2-update >= 2.18.3 +BuildRequires: yast2-storage >= 2.19.2 Requires: yast2 >= 2.16.36 Requires: yast2-core yast2-xml libxslt Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Tue Jan 5 17:07:41 2010 @@ -147,7 +147,7 @@ foreach(map lv, lvs, ``{ if (!contains(keepLVM[vgname]:[], lv["name"]:"")) { - Storage::DeleteDevice("","/dev/"+vgname+"/"+lv["name"]:"" ); + Storage::DeleteDevice("/dev/"+vgname+"/"+lv["name"]:""); } }); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Jan 5 17:07:41 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 05 16:59:39 CET 2010 - aschnell(a)suse.de + +- removed unused parameter from function Storage::DeleteDevice + +------------------------------------------------------------------- Mon Jan 04 14:29:41 CET 2010 - aschnell(a)suse.de - use ButtonBox widget (bnc #565871) Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Tue Jan 5 17:07:41 2010 @@ -1497,8 +1497,7 @@ y2milestone( "deleteAllDevPartitions dp:%1", dp ); foreach( map part, dp, ``{ - go_on = go_on && - Storage::DeleteDevice( del_dev, part["device"]:"" ); + go_on = go_on && Storage::DeleteDevice(part["device"]:""); }); } } Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Jan 5 17:07:41 2010 @@ -507,7 +507,7 @@ if (!isempty(partitions)) { foreach( string one_partition, pnames,{ - Storage::DeleteDevice( disk_info["device"]:"", one_partition ); + Storage::DeleteDevice(one_partition); }); } Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Tue Jan 5 17:07:41 2010 @@ -232,8 +232,7 @@ { boolean recursive = Storage::GetRecursiveRemoval(); Storage::SetRecursiveRemoval( true ); - Storage::DeleteDevice( disk["device"]:"", - part["device"]:"" ); + Storage::DeleteDevice(part["device"]:""); Storage::SetRecursiveRemoval( recursive ); return true; } @@ -265,8 +264,7 @@ } else { - Storage::DeleteDevice( disk["device"]:"", - part["device"]:"" ); + Storage::DeleteDevice(part["device"]:""); } return true; } Modified: trunk/storage/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-n… ============================================================================== --- trunk/storage/storage/src/include/ep-nfs.ycp (original) +++ trunk/storage/storage/src/include/ep-nfs.ycp Tue Jan 5 17:07:41 2010 @@ -142,7 +142,7 @@ //delete the one with old name and create new if (haskey(entry,"old_device")) { - Storage::DeleteDevice("/dev/nfs", entry["old_device"]:""); + Storage::DeleteDevice(entry["old_device"]:""); AddShare(entry); } else @@ -170,7 +170,7 @@ entry["device"]:"", entry["mount"]:"", entry["fstopt"]:""); string dev = entry["device"]:""; - Storage::DeleteDevice("/dev/nfs", dev ); + Storage::DeleteDevice(dev); } map <string, any> line = ( map <string, any> ) WFM::CallFunction("nfs-client4part", [ "HandleEvent", $[ "widget_id" : Event::IsWidgetActivated(event) ] ]); Modified: trunk/storage/storage/src/include/lvm_ui_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_ui_dialogs.ycp (original) +++ trunk/storage/storage/src/include/lvm_ui_dialogs.ycp Tue Jan 5 17:07:41 2010 @@ -47,7 +47,7 @@ if( Popup::YesNo( message )) { - ret = Storage::DeleteDevice(disk["device"]:"", id); + ret = Storage::DeleteDevice(id); } } y2milestone( "HandleRemoveLv ret:%1", ret ); Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Jan 5 17:07:41 2010 @@ -2432,9 +2432,9 @@ return( ret==0 ); } -global boolean DeleteDevice( string disk, string device ) +global boolean DeleteDevice(string device) { - y2milestone( "DeleteDevice disk:%1 device:%2", disk, device ); + y2milestone( "DeleteDevice device:%1", device ); integer ret = LibStorage::StorageInterface::removeVolume( sint, device ); if( ret<0 ) y2error( "DeleteDevice sint ret:%1", ret ); @@ -3308,7 +3308,7 @@ dps = sort( map a, map b, dps, ``(a["nr"]:0>b["nr"]:0)); y2milestone( "SetTargetMap dps:%1", dps ); } - foreach( map p, dps, ``{DeleteDevice( k, p["device"]:"" );}); + foreach( map p, dps, ``{DeleteDevice( p["device"]:"" );}); if( tg[k,"create"]:false ) { if( tg[k,"type"]:`CT_UNKNOWN==`CT_LVM ) @@ -3342,7 +3342,7 @@ ``{ if( size(p["dtxt"]:"")>0 ) ChangeDescText( p["device"]:"", p["dtxt"]:"" ); - DeleteDevice( k, p["device"]:"" ); + DeleteDevice( p["device"]:"" ); }); if( target[k,"delete"]:false ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60236 - /tags/stable-2_19_1/yast2/
by lslezak＠svn.opensuse.org 05 Jan '10

05 Jan '10

Author: lslezak Date: Tue Jan 5 16:29:14 2010 New Revision: 60236 URL: http://svn.opensuse.org/viewcvs/yast?rev=60236&view=rev Log: Created tag stable-2_19_1 for yast2 Added: tags/stable-2_19_1/yast2/ - copied from r60235, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60235 - in /trunk/yast2: VERSION library/wizard/src/Wizard.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 05 Jan '10

05 Jan '10

Author: lslezak Date: Tue Jan 5 16:29:09 2010 New Revision: 60235 URL: http://svn.opensuse.org/viewcvs/yast?rev=60235&view=rev Log: - added missing UI::SetProductName() call - display the proper product name in help texts (using &product; macro) (bnc#535483) - 2.19.1 Modified: trunk/yast2/VERSION trunk/yast2/library/wizard/src/Wizard.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=60235&r1=60234… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Jan 5 16:29:09 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/yast2/library/wizard/src/Wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Wizard.… ============================================================================== --- trunk/yast2/library/wizard/src/Wizard.ycp (original) +++ trunk/yast2/library/wizard/src/Wizard.ycp Tue Jan 5 16:29:09 2010 @@ -1840,6 +1840,7 @@ { y2milestone ("Setting product name to '%1'", name); product_name = name; + UI::SetProductName(product_name); } } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Jan 5 16:29:09 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 5 15:07:54 UTC 2010 - lslezak(a)suse.cz + +- added missing UI::SetProductName() call - display the proper + product name in help texts (using &product; macro) (bnc#535483) +- 2.19.1 + +------------------------------------------------------------------- Mon Dec 7 13:03:25 CET 2009 - jsrain(a)suse.cz - translate module names properly in NCurses CC (bnc#553644) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0