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