May 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r57326 - /trunk/ncurses/src/NCTablePad.h
by gs＠svn.opensuse.org 27 May '09

27 May '09

Author: gs Date: Wed May 27 10:56:36 2009 New Revision: 57326 URL: http://svn.opensuse.org/viewcvs/yast?rev=57326&view=rev Log: check newSortStrategy pointer Modified: trunk/ncurses/src/NCTablePad.h Modified: trunk/ncurses/src/NCTablePad.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTablePad.h?rev=573… ============================================================================== --- trunk/ncurses/src/NCTablePad.h (original) +++ trunk/ncurses/src/NCTablePad.h Wed May 27 10:56:36 2009 @@ -21,6 +21,7 @@ #include <iosfwd> #include <vector> +#include <memory> // auto_ptr #include "NCTableItem.h" #include "NCPad.h" @@ -234,11 +235,10 @@ void stripHotkeys(); - void setSortStrategy ( - NCTableSortStrategyBase* newSortStrategy // dyn. allocated - ) - { - sortStrategy.reset ( newSortStrategy ); + void setSortStrategy ( NCTableSortStrategyBase * newSortStrategy ) // dyn. allocated + { + if ( newSortStrategy != 0 ) + sortStrategy.reset ( newSortStrategy ); } }; -- 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] r57325 - in /trunk/yast2: library/system/src/Kernel.ycp package/yast2.changes
by juhliarik＠svn.opensuse.org 26 May '09

26 May '09

Author: juhliarik Date: Tue May 26 19:03:58 2009 New Revision: 57325 URL: http://svn.opensuse.org/viewcvs/yast?rev=57325&view=rev Log: added fix for problem with parsing command line during installation (bnc#462276) Modified: trunk/yast2/library/system/src/Kernel.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/system/src/Kernel.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Kernel.… ============================================================================== --- trunk/yast2/library/system/src/Kernel.ycp (original) +++ trunk/yast2/library/system/src/Kernel.ycp Tue May 26 19:03:58 2009 @@ -222,6 +222,15 @@ discardlist = add (discardlist, "AUTOCONSOLE"); } + // add special key filtering for s390 + // bnc#462276 Extraneous parameters in /etc/zipl.conf from the installer + if (Arch::s390()) + { + discardlist = add (discardlist, "User"); + discardlist = add (discardlist, "init"); + discardlist = add (discardlist, "ramdisk_size"); + } + // backdoor to re-enable update on UL/SLES if (contains (cmdlist, "suse_update")) { 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 May 26 19:03:58 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 26 19:02:36 CEST 2009 - juhliarik(a)suse.cz + +- added fix for problem with parsing command line (bnc#462276) + +------------------------------------------------------------------- Fri May 22 10:47:43 CEST 2009 - mvidner(a)suse.cz - yast2-completion.sh: removed <(process substitution) so that it -- 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] r57324 - in /branches/tmp/SLE-11-SP1-Stash/yast2: library/system/src/Kernel.ycp package/yast2.changes
by juhliarik＠svn.opensuse.org 26 May '09

26 May '09

Author: juhliarik Date: Tue May 26 19:00:30 2009 New Revision: 57324 URL: http://svn.opensuse.org/viewcvs/yast?rev=57324&view=rev Log: added fix for parsing command line Modified: branches/tmp/SLE-11-SP1-Stash/yast2/library/system/src/Kernel.ycp branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Modified: branches/tmp/SLE-11-SP1-Stash/yast2/library/system/src/Kernel.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/li… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/library/system/src/Kernel.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/library/system/src/Kernel.ycp Tue May 26 19:00:30 2009 @@ -222,6 +222,15 @@ discardlist = add (discardlist, "AUTOCONSOLE"); } + // add special key filtering for s390 + // bnc#462276 Extraneous parameters in /etc/zipl.conf from the installer + if (Arch::s390()) + { + discardlist = add (discardlist, "User"); + discardlist = add (discardlist, "init"); + discardlist = add (discardlist, "ramdisk_size"); + } + // backdoor to re-enable update on UL/SLES if (contains (cmdlist, "suse_update")) { Modified: branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/pa… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Tue May 26 19:00:30 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 26 18:59:03 CEST 2009 - juhliarik(a)suse.cz + +- added fix for problem with parsing command line (bnc#462276) + +------------------------------------------------------------------- Thu Apr 9 10:04:19 CEST 2009 - lslezak(a)suse.cz - PackageSystem.ycp - check nil result of Pkg::PkgCommit() call -- 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] r57323 - in /trunk/storage: ./ libstorage/bindings/python/ libstorage/bindings/ycp/ libstorage/examples/ libstorage/src/ libstorage/testsuite-real/ libstorage/testsuite/ package/
by aschnell＠svn.opensuse.org 26 May '09

26 May '09

Author: aschnell Date: Tue May 26 17:45:25 2009 New Revision: 57323 URL: http://svn.opensuse.org/viewcvs/yast?rev=57323&view=rev Log: - library liby2storage -> libstorage Added: trunk/storage/package/yast2-storage-rpmlintrc Modified: trunk/storage/libstorage/bindings/python/Makefile trunk/storage/libstorage/bindings/ycp/Makefile.am trunk/storage/libstorage/examples/Makefile.am trunk/storage/libstorage/examples/Makefile.example trunk/storage/libstorage/src/Makefile.am trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/testsuite-real/Makefile.am trunk/storage/libstorage/testsuite/Makefile.am trunk/storage/yast2-storage.spec.in Modified: trunk/storage/libstorage/bindings/python/Makefile URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/pyth… ============================================================================== --- trunk/storage/libstorage/bindings/python/Makefile (original) +++ trunk/storage/libstorage/bindings/python/Makefile Tue May 26 17:45:25 2009 @@ -15,5 +15,5 @@ ../../src/Graph.h swig -Wall -c++ -python LibStorage.i g++ -c -I/usr/include/python -O2 -fPIC -pipe LibStorage_wrap.cxx - g++ -shared LibStorage_wrap.o -o _LibStorage.so -ly2storage + g++ -shared LibStorage_wrap.o -o _LibStorage.so -lstorage Modified: trunk/storage/libstorage/bindings/ycp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/ycp/… ============================================================================== --- trunk/storage/libstorage/bindings/ycp/Makefile.am (original) +++ trunk/storage/libstorage/bindings/ycp/Makefile.am Tue May 26 17:45:25 2009 @@ -3,7 +3,7 @@ # PLUGLIB_MODULE = LibStorage -PLUGLIB_LIBRARY = ../../src/.libs/liby2storage.so +PLUGLIB_LIBRARY = ../../src/.libs/libstorage.so PLUGLIB_DEPEND = \ ../../src/StorageInterface.h \ ../../src/HumanString.h \ Modified: trunk/storage/libstorage/examples/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Make… ============================================================================== --- trunk/storage/libstorage/examples/Makefile.am (original) +++ trunk/storage/libstorage/examples/Makefile.am Tue May 26 17:45:25 2009 @@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/libstorage/src -I/usr/include/YaST2 -LDADD = ../src/liby2storage.la +LDADD = ../src/libstorage.la noinst_PROGRAMS = TestDisk TestDiskLog TestStorage TestProbing TestLvm \ TestMd TestLoop TestLock SaveGraph Modified: trunk/storage/libstorage/examples/Makefile.example URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Make… ============================================================================== --- trunk/storage/libstorage/examples/Makefile.example (original) +++ trunk/storage/libstorage/examples/Makefile.example Tue May 26 17:45:25 2009 @@ -1,7 +1,7 @@ CXXFLAGS = -MMD -g -I /usr/include/YaST2 -LDFLAGS = -ly2storage +LDADD = -lstorage PROGRAMS = TestDisk TestDiskLog TestProbing TestLvm TestMd TestLoop \ SaveGraph Modified: trunk/storage/libstorage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Makefile.… ============================================================================== --- trunk/storage/libstorage/src/Makefile.am (original) +++ trunk/storage/libstorage/src/Makefile.am Tue May 26 17:45:25 2009 @@ -19,9 +19,9 @@ y2tool generateYCPWrappers StorageCallbacks.h StorageCallbacksBuiltinCalls.h StorageCallbacksBuiltinTable.h -lib_LTLIBRARIES = liby2storage.la +lib_LTLIBRARIES = libstorage.la -liby2storage_la_SOURCES = \ +libstorage_la_SOURCES = \ StorageInterface.h \ Storage.cc Storage.h \ Container.cc Container.h \ @@ -64,8 +64,8 @@ Region.h StorageTmpl.h \ StorageDefines.h -liby2storage_la_LDFLAGS = -version-info 2:0 -liby2storage_la_LIBADD = -lblocxx +libstorage_la_LDFLAGS = -version-info 2:0 +libstorage_la_LIBADD = -lblocxx plugin_LTLIBRARIES = libpy2StorageCallbacks.la @@ -75,7 +75,7 @@ StorageCallbacks.cc StorageCallbacks.h libpy2StorageCallbacks_la_LDFLAGS = -version-info 2:0 -libpy2StorageCallbacks_la_LIBADD = -L$(libdir) -ly2 -lycp liby2storage.la +libpy2StorageCallbacks_la_LIBADD = -L$(libdir) -ly2 -lycp libstorage.la pkgincludedir = $(includedir)/storage Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue May 26 17:45:25 2009 @@ -99,7 +99,7 @@ * * If you have installed the latest yast2-storage package you can find more * examples in the directory - * /usr/share/doc/packages/yast2-storage/examples/liby2storage. + * /usr/share/doc/packages/yast2-storage/examples/libstorage. */ Modified: trunk/storage/libstorage/testsuite-real/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite-rea… ============================================================================== --- trunk/storage/libstorage/testsuite-real/Makefile.am (original) +++ trunk/storage/libstorage/testsuite-real/Makefile.am Tue May 26 17:45:25 2009 @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/libstorage/src -LDADD = ../src/liby2storage.la +LDADD = ../src/libstorage.la noinst_PROGRAMS = lvmcreate1 lvmcreate2 lvmextend1 lvmextend2 Modified: trunk/storage/libstorage/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/Mak… ============================================================================== --- trunk/storage/libstorage/testsuite/Makefile.am (original) +++ trunk/storage/libstorage/testsuite/Makefile.am Tue May 26 17:45:25 2009 @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/libstorage/src -LDADD = ../src/liby2storage.la +LDADD = ../src/libstorage.la noinst_PROGRAMS = partition1.single format1.single uuid1.single fstab1.single \ lvm_create.single lvm_extend.single md_create.single \ Added: trunk/storage/package/yast2-storage-rpmlintrc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage-rp… ============================================================================== --- trunk/storage/package/yast2-storage-rpmlintrc (added) +++ trunk/storage/package/yast2-storage-rpmlintrc Tue May 26 17:45:25 2009 @@ -0,0 +1 @@ +addFilter("shlib-policy-name-error") Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Tue May 26 17:45:25 2009 @@ -100,7 +100,7 @@ %files lib %defattr(-,root,root) -%{_libdir}/liby2storage.so.* +%{_libdir}/libstorage.so.* %dir /var/lock/libstorage %post lib @@ -119,8 +119,8 @@ %files devel %defattr(-,root,root) -%{_libdir}/liby2storage.la -%{_libdir}/liby2storage.so +%{_libdir}/libstorage.la +%{_libdir}/libstorage.so @includedir@ %doc @docdir@/autodocs %doc @docdir@/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] r57322 - in /trunk/storage/libstorage: examples/Makefile.am examples/Makefile.example testsuite-real/Makefile.am testsuite/Makefile.am
by aschnell＠svn.opensuse.org 26 May '09

26 May '09

Author: aschnell Date: Tue May 26 16:53:40 2009 New Revision: 57322 URL: http://svn.opensuse.org/viewcvs/yast?rev=57322&view=rev Log: - simplified Makefiles Modified: trunk/storage/libstorage/examples/Makefile.am trunk/storage/libstorage/examples/Makefile.example trunk/storage/libstorage/testsuite-real/Makefile.am trunk/storage/libstorage/testsuite/Makefile.am Modified: trunk/storage/libstorage/examples/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Make… ============================================================================== --- trunk/storage/libstorage/examples/Makefile.am (original) +++ trunk/storage/libstorage/examples/Makefile.am Tue May 26 16:53:40 2009 @@ -5,9 +5,8 @@ PACKAGE = libstorage INCLUDES = -I$(top_srcdir)/libstorage/src -I/usr/include/YaST2 -LDADD = ../src/liby2storage.la -AM_CXXFLAGS = +LDADD = ../src/liby2storage.la noinst_PROGRAMS = TestDisk TestDiskLog TestStorage TestProbing TestLvm \ TestMd TestLoop TestLock SaveGraph Modified: trunk/storage/libstorage/examples/Makefile.example URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Make… ============================================================================== --- trunk/storage/libstorage/examples/Makefile.example (original) +++ trunk/storage/libstorage/examples/Makefile.example Tue May 26 16:53:40 2009 @@ -1,7 +1,10 @@ + CXXFLAGS = -MMD -g -I /usr/include/YaST2 + LDFLAGS = -ly2storage -PROGRAMS = TestDisk TestDiskLog TestProbing TestLvm TestMd TestLoop +PROGRAMS = TestDisk TestDiskLog TestProbing TestLvm TestMd TestLoop \ + SaveGraph all: $(PROGRAMS) @@ -17,6 +20,8 @@ TestLoop: TestLoop.o +SaveGraph: SaveGraph.o + clean: rm -f *.d *.o $(PROGRAMS) Modified: trunk/storage/libstorage/testsuite-real/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite-rea… ============================================================================== --- trunk/storage/libstorage/testsuite-real/Makefile.am (original) +++ trunk/storage/libstorage/testsuite-real/Makefile.am Tue May 26 16:53:40 2009 @@ -4,19 +4,14 @@ INCLUDES = -I$(top_srcdir)/libstorage/src -AM_CPPFLAGS = -AM_CXXFLAGS = +LDADD = ../src/liby2storage.la noinst_PROGRAMS = lvmcreate1 lvmcreate2 lvmextend1 lvmextend2 lvmcreate1_SOURCES = lvmcreate1.cc -lvmcreate1_LDADD = ../src/liby2storage.la lvmcreate2_SOURCES = lvmcreate2.cc -lvmcreate2_LDADD = ../src/liby2storage.la lvmextend1_SOURCES = lvmextend1.cc -lvmextend1_LDADD = ../src/liby2storage.la lvmextend2_SOURCES = lvmextend2.cc -lvmextend2_LDADD = ../src/liby2storage.la Modified: trunk/storage/libstorage/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/Mak… ============================================================================== --- trunk/storage/libstorage/testsuite/Makefile.am (original) +++ trunk/storage/libstorage/testsuite/Makefile.am Tue May 26 16:53:40 2009 @@ -8,39 +8,29 @@ INCLUDES = -I$(top_srcdir)/libstorage/src -AM_CPPFLAGS = -AM_CXXFLAGS = +LDADD = ../src/liby2storage.la noinst_PROGRAMS = partition1.single format1.single uuid1.single fstab1.single \ lvm_create.single lvm_extend.single md_create.single \ humanstring1.single humanstring2.single partition1_single_SOURCES = partition1.cc common.cc common.h -partition1_single_LDADD = ../src/liby2storage.la format1_single_SOURCES = format1.cc common.cc common.h -format1_single_LDADD = ../src/liby2storage.la uuid1_single_SOURCES = uuid1.cc common.cc common.h -uuid1_single_LDADD = ../src/liby2storage.la fstab1_single_SOURCES = fstab1.cc common.cc common.h -fstab1_single_LDADD = ../src/liby2storage.la lvm_create_single_SOURCES = lvm_create.cc common.cc common.h -lvm_create_single_LDADD = ../src/liby2storage.la lvm_extend_single_SOURCES = lvm_extend.cc common.cc common.h -lvm_extend_single_LDADD = ../src/liby2storage.la md_create_single_SOURCES = md_create.cc common.cc common.h -md_create_single_LDADD = ../src/liby2storage.la humanstring1_single_SOURCES = humanstring1.cc -humanstring1_single_LDADD = ../src/liby2storage.la humanstring2_single_SOURCES = humanstring2.cc -humanstring2_single_LDADD = ../src/liby2storage.la clean-local: rm -f tmp.err.* tmp.out.* site.exp site.bak -- 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] r57321 - /trunk/storage/libstorage/src/Graph.cc
by aschnell＠svn.opensuse.org 26 May '09

26 May '09

Author: aschnell Date: Tue May 26 16:41:29 2009 New Revision: 57321 URL: http://svn.opensuse.org/viewcvs/yast?rev=57321&view=rev Log: - changed comment Modified: trunk/storage/libstorage/src/Graph.cc Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?… ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Tue May 26 16:41:29 2009 @@ -376,7 +376,7 @@ ofstream out(filename.c_str()); classic(out); - out << "// generated by YaST (" << PACKAGE_STRING << ")" << endl; + out << "// generated by libstorage (" << PACKAGE_STRING << ")" << endl; out << "// " << hostname() << ", " << datetime() << endl; out << endl; -- 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] r57320 - in /branches/tmp/SLE-11-SP1-Stash/transfer: VERSION agent-tftp/src/TftpAgent.cc package/yast2-transfer.changes
by ug＠svn.opensuse.org 26 May '09

26 May '09

Author: ug Date: Tue May 26 16:13:25 2009 New Revision: 57320 URL: http://svn.opensuse.org/viewcvs/yast?rev=57320&view=rev Log: send ACK package for the last DATA package that was received via TFTP (bnc#507086). 2.16.2 Modified: branches/tmp/SLE-11-SP1-Stash/transfer/VERSION branches/tmp/SLE-11-SP1-Stash/transfer/agent-tftp/src/TftpAgent.cc branches/tmp/SLE-11-SP1-Stash/transfer/package/yast2-transfer.changes Modified: branches/tmp/SLE-11-SP1-Stash/transfer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/transfer… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/transfer/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/transfer/VERSION Tue May 26 16:13:25 2009 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: branches/tmp/SLE-11-SP1-Stash/transfer/agent-tftp/src/TftpAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/transfer… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/transfer/agent-tftp/src/TftpAgent.cc (original) +++ branches/tmp/SLE-11-SP1-Stash/transfer/agent-tftp/src/TftpAgent.cc Tue May 26 16:13:25 2009 @@ -158,7 +158,8 @@ cp += len; } else if (finished) { - break; +// dont break here, we need the ACK for the last package +// break; } } /* send packet */ @@ -175,6 +176,9 @@ len = -1; break; } + if( cmd_get && (opcode == 4) && finished ) + // ACK sent + break; /* receive packet */ memset(&from, 0, sizeof(from)); fromlen = sizeof(from); @@ -229,7 +233,7 @@ } } while (timeout && (len >= 0)); - if (len < 0) { + if (len < 0 || finished ) { break; } Modified: branches/tmp/SLE-11-SP1-Stash/transfer/package/yast2-transfer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/transfer… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/transfer/package/yast2-transfer.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/transfer/package/yast2-transfer.changes Tue May 26 16:13:25 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue May 26 16:09:53 CEST 2009 - ug(a)suse.de + +- send ACK package for the last DATA package that was received via + TFTP (bnc#507086) +- version 2.16.2 + +------------------------------------------------------------------- Fri Jan 4 09:46:04 CET 2008 - ug(a)suse.de - follow HTTP code 301 and 302 (#344123) -- 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] r57319 - in /branches/SuSE-SLE-10-SP3-Branch/transfer: VERSION agent-tftp/src/TftpAgent.cc package/yast2-transfer.changes
by ug＠svn.opensuse.org 26 May '09

26 May '09

Author: ug Date: Tue May 26 16:05:34 2009 New Revision: 57319 URL: http://svn.opensuse.org/viewcvs/yast?rev=57319&view=rev Log: send ACK package for the last DATA package that was received via TFTP (bnc#507086). 2.13.5 Modified: branches/SuSE-SLE-10-SP3-Branch/transfer/VERSION branches/SuSE-SLE-10-SP3-Branch/transfer/agent-tftp/src/TftpAgent.cc branches/SuSE-SLE-10-SP3-Branch/transfer/package/yast2-transfer.changes Modified: branches/SuSE-SLE-10-SP3-Branch/transfer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/transf… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/transfer/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/transfer/VERSION Tue May 26 16:05:34 2009 @@ -1 +1 @@ -2.13.4 +2.13.5 Modified: branches/SuSE-SLE-10-SP3-Branch/transfer/agent-tftp/src/TftpAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/transf… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/transfer/agent-tftp/src/TftpAgent.cc (original) +++ branches/SuSE-SLE-10-SP3-Branch/transfer/agent-tftp/src/TftpAgent.cc Tue May 26 16:05:34 2009 @@ -158,7 +158,8 @@ cp += len; } else if (finished) { - break; +// dont break here, we need the ACK for the last package +// break; } } /* send packet */ @@ -175,6 +176,9 @@ len = -1; break; } + if( cmd_get && (opcode == 4) && finished ) + // ACK sent + break; /* receive packet */ memset(&from, 0, sizeof(from)); fromlen = sizeof(from); @@ -229,7 +233,7 @@ } } while (timeout && (len >= 0)); - if (len < 0) { + if (len < 0 || finished ) { break; } Modified: branches/SuSE-SLE-10-SP3-Branch/transfer/package/yast2-transfer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/transf… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/transfer/package/yast2-transfer.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/transfer/package/yast2-transfer.changes Tue May 26 16:05:34 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue May 26 16:04:14 CEST 2009 - ug(a)suse.de + +- send ACK package for the last DATA package that was received + via TFTP (bnc#507086) +- 2.13.5 + +------------------------------------------------------------------- Thu Jan 11 15:07:11 CET 2007 - ug(a)suse.de - 2.13.4 -- 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] r57318 - in /trunk/storage/libstorage: examples/ src/ testsuite-real/ testsuite/
by aschnell＠svn.opensuse.org 26 May '09

26 May '09

Author: aschnell Date: Tue May 26 15:52:03 2009 New Revision: 57318 URL: http://svn.opensuse.org/viewcvs/yast?rev=57318&view=rev Log: - include files y2storage -> storage Modified: trunk/storage/libstorage/examples/SaveGraph.cc trunk/storage/libstorage/examples/TestDisk.cc trunk/storage/libstorage/examples/TestDiskLog.cc trunk/storage/libstorage/examples/TestLock.cc trunk/storage/libstorage/examples/TestLoop.cc trunk/storage/libstorage/examples/TestLvm.cc trunk/storage/libstorage/examples/TestMd.cc trunk/storage/libstorage/examples/TestProbing.cc trunk/storage/libstorage/examples/TestStorage.cc trunk/storage/libstorage/src/ (props changed) trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AsciiFile.cc trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Container.h trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Dasd.h trunk/storage/libstorage/src/DerefIterator.h trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Disk.h trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/Dm.h trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/DmCo.h trunk/storage/libstorage/src/DmPart.cc trunk/storage/libstorage/src/DmPart.h trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/DmPartCo.h trunk/storage/libstorage/src/Dmmultipath.cc trunk/storage/libstorage/src/Dmmultipath.h trunk/storage/libstorage/src/DmmultipathCo.cc trunk/storage/libstorage/src/DmmultipathCo.h trunk/storage/libstorage/src/Dmraid.cc trunk/storage/libstorage/src/Dmraid.h trunk/storage/libstorage/src/DmraidCo.cc trunk/storage/libstorage/src/DmraidCo.h trunk/storage/libstorage/src/EtcFstab.cc trunk/storage/libstorage/src/EtcFstab.h trunk/storage/libstorage/src/EtcRaidtab.cc trunk/storage/libstorage/src/EtcRaidtab.h trunk/storage/libstorage/src/FilterIterator.h trunk/storage/libstorage/src/Graph.cc trunk/storage/libstorage/src/ListListIterator.h trunk/storage/libstorage/src/Lock.cc trunk/storage/libstorage/src/Loop.cc trunk/storage/libstorage/src/Loop.h trunk/storage/libstorage/src/LoopCo.cc trunk/storage/libstorage/src/LoopCo.h trunk/storage/libstorage/src/LvmLv.cc trunk/storage/libstorage/src/LvmLv.h trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/LvmVg.h trunk/storage/libstorage/src/Makefile.am trunk/storage/libstorage/src/Md.cc trunk/storage/libstorage/src/Md.h trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/MdCo.h trunk/storage/libstorage/src/Nfs.cc trunk/storage/libstorage/src/Nfs.h trunk/storage/libstorage/src/NfsCo.cc trunk/storage/libstorage/src/NfsCo.h trunk/storage/libstorage/src/OutputProcessor.cc trunk/storage/libstorage/src/OutputProcessor.h trunk/storage/libstorage/src/Partition.cc trunk/storage/libstorage/src/Partition.h trunk/storage/libstorage/src/PeContainer.cc trunk/storage/libstorage/src/PeContainer.h trunk/storage/libstorage/src/ProcMounts.cc trunk/storage/libstorage/src/ProcMounts.h trunk/storage/libstorage/src/ProcPart.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/StorageTmpl.h trunk/storage/libstorage/src/StorageTypes.cc trunk/storage/libstorage/src/StorageTypes.h trunk/storage/libstorage/src/SystemCmd.cc trunk/storage/libstorage/src/Volume.cc trunk/storage/libstorage/src/Volume.h trunk/storage/libstorage/testsuite-real/lvmcreate1.cc trunk/storage/libstorage/testsuite-real/lvmcreate2.cc trunk/storage/libstorage/testsuite-real/lvmextend1.cc trunk/storage/libstorage/testsuite-real/lvmextend2.cc trunk/storage/libstorage/testsuite/common.h trunk/storage/libstorage/testsuite/format1.cc trunk/storage/libstorage/testsuite/humanstring1.cc trunk/storage/libstorage/testsuite/humanstring2.cc trunk/storage/libstorage/testsuite/partition1.cc trunk/storage/libstorage/testsuite/uuid1.cc Modified: trunk/storage/libstorage/examples/SaveGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Save… ============================================================================== --- trunk/storage/libstorage/examples/SaveGraph.cc (original) +++ trunk/storage/libstorage/examples/SaveGraph.cc Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #include <stdlib.h> -#include <y2storage/StorageInterface.h> -#include <y2storage/Graph.h> +#include <storage/StorageInterface.h> +#include <storage/Graph.h> using namespace storage; Modified: trunk/storage/libstorage/examples/TestDisk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestDisk.cc (original) +++ trunk/storage/libstorage/examples/TestDisk.cc Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #include <iostream> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using namespace storage; using namespace std; Modified: trunk/storage/libstorage/examples/TestDiskLog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestDiskLog.cc (original) +++ trunk/storage/libstorage/examples/TestDiskLog.cc Tue May 26 15:52:03 2009 @@ -2,7 +2,7 @@ #include <getopt.h> #include <iostream> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using namespace storage; using namespace std; Modified: trunk/storage/libstorage/examples/TestLock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestLock.cc (original) +++ trunk/storage/libstorage/examples/TestLock.cc Tue May 26 15:52:03 2009 @@ -6,8 +6,8 @@ #include <getopt.h> #include <iostream> -#include <y2storage/Lock.h> -#include <y2storage/Storage.h> +#include <storage/Lock.h> +#include <storage/Storage.h> using namespace std; using namespace storage; Modified: trunk/storage/libstorage/examples/TestLoop.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestLoop.cc (original) +++ trunk/storage/libstorage/examples/TestLoop.cc Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #include <iostream> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using namespace storage; using namespace std; Modified: trunk/storage/libstorage/examples/TestLvm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestLvm.cc (original) +++ trunk/storage/libstorage/examples/TestLvm.cc Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #include <iostream> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using namespace storage; using namespace std; Modified: trunk/storage/libstorage/examples/TestMd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestMd.cc (original) +++ trunk/storage/libstorage/examples/TestMd.cc Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #include <iostream> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using namespace storage; using namespace std; Modified: trunk/storage/libstorage/examples/TestProbing.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestProbing.cc (original) +++ trunk/storage/libstorage/examples/TestProbing.cc Tue May 26 15:52:03 2009 @@ -7,7 +7,7 @@ #include <stdlib.h> #include <iostream> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using namespace storage; using namespace std; Modified: trunk/storage/libstorage/examples/TestStorage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestStorage.cc (original) +++ trunk/storage/libstorage/examples/TestStorage.cc Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #include <iostream> -#include <y2storage/Storage.h> -#include <y2storage/ListListIterator.h> +#include <storage/Storage.h> +#include <storage/ListListIterator.h> using namespace std; using namespace storage; Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Tue May 26 15:52:03 2009 @@ -18,11 +18,11 @@ #include <blocxx/Logger.hpp> #include <blocxx/LogMessage.hpp> -#include "y2storage/AsciiFile.h" -#include "y2storage/StorageTmpl.h" -#include "y2storage/AppUtil.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/StorageTypes.h" +#include "storage/AsciiFile.h" +#include "storage/StorageTmpl.h" +#include "storage/AppUtil.h" +#include "storage/SystemCmd.h" +#include "storage/StorageTypes.h" namespace storage Modified: trunk/storage/libstorage/src/AsciiFile.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile… ============================================================================== --- trunk/storage/libstorage/src/AsciiFile.cc (original) +++ trunk/storage/libstorage/src/AsciiFile.cc Tue May 26 15:52:03 2009 @@ -7,9 +7,9 @@ #include <unistd.h> #include <fstream> -#include "y2storage/AppUtil.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AsciiFile.h" +#include "storage/AppUtil.h" +#include "storage/SystemCmd.h" +#include "storage/AsciiFile.h" namespace storage Modified: trunk/storage/libstorage/src/Container.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container… ============================================================================== --- trunk/storage/libstorage/src/Container.cc (original) +++ trunk/storage/libstorage/src/Container.cc Tue May 26 15:52:03 2009 @@ -6,10 +6,10 @@ #include <algorithm> #include <list> -#include "y2storage/Container.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/Storage.h" -#include "y2storage/AppUtil.h" +#include "storage/Container.h" +#include "storage/SystemCmd.h" +#include "storage/Storage.h" +#include "storage/AppUtil.h" namespace storage Modified: trunk/storage/libstorage/src/Container.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container… ============================================================================== --- trunk/storage/libstorage/src/Container.h (original) +++ trunk/storage/libstorage/src/Container.h Tue May 26 15:52:03 2009 @@ -3,9 +3,9 @@ #include <list> -#include "y2storage/Volume.h" -#include "y2storage/StorageTypes.h" -#include "y2storage/StorageTmpl.h" +#include "storage/Volume.h" +#include "storage/StorageTypes.h" +#include "storage/StorageTmpl.h" namespace storage Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Tue May 26 15:52:03 2009 @@ -9,12 +9,12 @@ #include <iomanip> #include <boost/algorithm/string.hpp> -#include "y2storage/SystemCmd.h" -#include "y2storage/ProcPart.h" -#include "y2storage/Storage.h" -#include "y2storage/OutputProcessor.h" -#include "y2storage/Dasd.h" -#include "y2storage/StorageDefines.h" +#include "storage/SystemCmd.h" +#include "storage/ProcPart.h" +#include "storage/Storage.h" +#include "storage/OutputProcessor.h" +#include "storage/Dasd.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/Dasd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.h?re… ============================================================================== --- trunk/storage/libstorage/src/Dasd.h (original) +++ trunk/storage/libstorage/src/Dasd.h Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #ifndef DASD_H #define DASD_H -#include "y2storage/Disk.h" +#include "storage/Disk.h" namespace storage Modified: trunk/storage/libstorage/src/DerefIterator.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DerefIter… ============================================================================== --- trunk/storage/libstorage/src/DerefIterator.h (original) +++ trunk/storage/libstorage/src/DerefIterator.h Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #ifndef DEREF_ITERATOR_H #define DEREF_ITERATOR_H -#include "y2storage/AppUtil.h" +#include "storage/AppUtil.h" namespace storage { Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Tue May 26 15:52:03 2009 @@ -13,15 +13,15 @@ #include <iomanip> #include <boost/algorithm/string.hpp> -#include "y2storage/Region.h" -#include "y2storage/Partition.h" -#include "y2storage/ProcPart.h" -#include "y2storage/Disk.h" -#include "y2storage/Storage.h" -#include "y2storage/AsciiFile.h" -#include "y2storage/AppUtil.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/StorageDefines.h" +#include "storage/Region.h" +#include "storage/Partition.h" +#include "storage/ProcPart.h" +#include "storage/Disk.h" +#include "storage/Storage.h" +#include "storage/AsciiFile.h" +#include "storage/AppUtil.h" +#include "storage/SystemCmd.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/Disk.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?re… ============================================================================== --- trunk/storage/libstorage/src/Disk.h (original) +++ trunk/storage/libstorage/src/Disk.h Tue May 26 15:52:03 2009 @@ -3,8 +3,8 @@ #include <list> -#include "y2storage/Container.h" -#include "y2storage/Partition.h" +#include "storage/Container.h" +#include "storage/Partition.h" namespace storage Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Tue May 26 15:52:03 2009 @@ -4,13 +4,13 @@ #include <sstream> -#include "y2storage/Dm.h" -#include "y2storage/PeContainer.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Regex.h" -#include "y2storage/Storage.h" -#include "y2storage/StorageDefines.h" +#include "storage/Dm.h" +#include "storage/PeContainer.h" +#include "storage/SystemCmd.h" +#include "storage/AppUtil.h" +#include "storage/Regex.h" +#include "storage/Storage.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/Dm.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.h?rev=… ============================================================================== --- trunk/storage/libstorage/src/Dm.h (original) +++ trunk/storage/libstorage/src/Dm.h Tue May 26 15:52:03 2009 @@ -3,7 +3,7 @@ #include <map> -#include "y2storage/Volume.h" +#include "storage/Volume.h" namespace storage { Modified: trunk/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/DmCo.cc (original) +++ trunk/storage/libstorage/src/DmCo.cc Tue May 26 15:52:03 2009 @@ -5,13 +5,13 @@ #include <ostream> #include <sstream> -#include "y2storage/DmCo.h" -#include "y2storage/Dm.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/ProcPart.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" -#include "y2storage/StorageDefines.h" +#include "storage/DmCo.h" +#include "storage/Dm.h" +#include "storage/SystemCmd.h" +#include "storage/ProcPart.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/DmCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.h?re… ============================================================================== --- trunk/storage/libstorage/src/DmCo.h (original) +++ trunk/storage/libstorage/src/DmCo.h Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #ifndef DM_CO_H #define DM_CO_H -#include "y2storage/PeContainer.h" -#include "y2storage/Dm.h" +#include "storage/PeContainer.h" +#include "storage/Dm.h" namespace storage { Modified: trunk/storage/libstorage/src/DmPart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.cc… ============================================================================== --- trunk/storage/libstorage/src/DmPart.cc (original) +++ trunk/storage/libstorage/src/DmPart.cc Tue May 26 15:52:03 2009 @@ -4,12 +4,12 @@ #include <sstream> -#include "y2storage/DmPart.h" -#include "y2storage/DmPartCo.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/ProcPart.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" +#include "storage/DmPart.h" +#include "storage/DmPartCo.h" +#include "storage/SystemCmd.h" +#include "storage/ProcPart.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" namespace storage Modified: trunk/storage/libstorage/src/DmPart.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.h?… ============================================================================== --- trunk/storage/libstorage/src/DmPart.h (original) +++ trunk/storage/libstorage/src/DmPart.h Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #ifndef DM_PART_H #define DM_PART_H -#include "y2storage/Dm.h" -#include "y2storage/Partition.h" +#include "storage/Dm.h" +#include "storage/Partition.h" namespace storage { Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.… ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Tue May 26 15:52:03 2009 @@ -5,14 +5,14 @@ #include <ostream> #include <sstream> -#include "y2storage/DmPartCo.h" -#include "y2storage/DmPart.h" -#include "y2storage/ProcPart.h" -#include "y2storage/Partition.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" -#include "y2storage/StorageDefines.h" +#include "storage/DmPartCo.h" +#include "storage/DmPart.h" +#include "storage/ProcPart.h" +#include "storage/Partition.h" +#include "storage/SystemCmd.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/DmPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.… ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.h (original) +++ trunk/storage/libstorage/src/DmPartCo.h Tue May 26 15:52:03 2009 @@ -3,9 +3,9 @@ #include <list> -#include "y2storage/PeContainer.h" -#include "y2storage/Disk.h" -#include "y2storage/DmPart.h" +#include "storage/PeContainer.h" +#include "storage/Disk.h" +#include "storage/DmPart.h" namespace storage Modified: trunk/storage/libstorage/src/Dmmultipath.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/Dmmultipath.cc (original) +++ trunk/storage/libstorage/src/Dmmultipath.cc Tue May 26 15:52:03 2009 @@ -4,11 +4,11 @@ #include <sstream> -#include "y2storage/Dmmultipath.h" -#include "y2storage/DmmultipathCo.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" +#include "storage/Dmmultipath.h" +#include "storage/DmmultipathCo.h" +#include "storage/SystemCmd.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" namespace storage Modified: trunk/storage/libstorage/src/Dmmultipath.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/Dmmultipath.h (original) +++ trunk/storage/libstorage/src/Dmmultipath.h Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #ifndef DMMULTIPATH_H #define DMMULTIPATH_H -#include "y2storage/DmPart.h" +#include "storage/DmPart.h" namespace storage { Modified: trunk/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.cc (original) +++ trunk/storage/libstorage/src/DmmultipathCo.cc Tue May 26 15:52:03 2009 @@ -7,12 +7,12 @@ #include <locale> #include <boost/algorithm/string.hpp> -#include "y2storage/DmmultipathCo.h" -#include "y2storage/Dmmultipath.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" -#include "y2storage/StorageDefines.h" +#include "storage/DmmultipathCo.h" +#include "storage/Dmmultipath.h" +#include "storage/SystemCmd.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/DmmultipathCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.h (original) +++ trunk/storage/libstorage/src/DmmultipathCo.h Tue May 26 15:52:03 2009 @@ -3,8 +3,8 @@ #include <list> -#include "y2storage/DmPartCo.h" -#include "y2storage/Dmmultipath.h" +#include "storage/DmPartCo.h" +#include "storage/Dmmultipath.h" namespace storage { Modified: trunk/storage/libstorage/src/Dmraid.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmraid.cc… ============================================================================== --- trunk/storage/libstorage/src/Dmraid.cc (original) +++ trunk/storage/libstorage/src/Dmraid.cc Tue May 26 15:52:03 2009 @@ -4,11 +4,11 @@ #include <sstream> -#include "y2storage/Dmraid.h" -#include "y2storage/DmraidCo.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" +#include "storage/Dmraid.h" +#include "storage/DmraidCo.h" +#include "storage/SystemCmd.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" namespace storage Modified: trunk/storage/libstorage/src/Dmraid.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmraid.h?… ============================================================================== --- trunk/storage/libstorage/src/Dmraid.h (original) +++ trunk/storage/libstorage/src/Dmraid.h Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #ifndef DMRAID_H #define DMRAID_H -#include "y2storage/DmPart.h" +#include "storage/DmPart.h" namespace storage { Modified: trunk/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.cc (original) +++ trunk/storage/libstorage/src/DmraidCo.cc Tue May 26 15:52:03 2009 @@ -5,12 +5,12 @@ #include <ostream> #include <sstream> -#include "y2storage/DmraidCo.h" -#include "y2storage/Dmraid.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" -#include "y2storage/StorageDefines.h" +#include "storage/DmraidCo.h" +#include "storage/Dmraid.h" +#include "storage/SystemCmd.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/DmraidCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.h (original) +++ trunk/storage/libstorage/src/DmraidCo.h Tue May 26 15:52:03 2009 @@ -3,8 +3,8 @@ #include <list> -#include "y2storage/DmPartCo.h" -#include "y2storage/Dmraid.h" +#include "storage/DmPartCo.h" +#include "storage/Dmraid.h" namespace storage { Modified: trunk/storage/libstorage/src/EtcFstab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.… ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.cc (original) +++ trunk/storage/libstorage/src/EtcFstab.cc Tue May 26 15:52:03 2009 @@ -7,13 +7,13 @@ #include <fstream> #include <algorithm> -#include "y2storage/AppUtil.h" -#include "y2storage/StorageTypes.h" -#include "y2storage/AsciiFile.h" -#include "y2storage/Regex.h" -#include "y2storage/StorageTmpl.h" -#include "y2storage/Volume.h" -#include "y2storage/EtcFstab.h" +#include "storage/AppUtil.h" +#include "storage/StorageTypes.h" +#include "storage/AsciiFile.h" +#include "storage/Regex.h" +#include "storage/StorageTmpl.h" +#include "storage/Volume.h" +#include "storage/EtcFstab.h" namespace storage Modified: trunk/storage/libstorage/src/EtcFstab.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.… ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.h (original) +++ trunk/storage/libstorage/src/EtcFstab.h Tue May 26 15:52:03 2009 @@ -6,7 +6,7 @@ #include <map> #include <boost/algorithm/string.hpp> -#include "y2storage/StorageInterface.h" +#include "storage/StorageInterface.h" namespace storage { Modified: trunk/storage/libstorage/src/EtcRaidtab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcRaidta… ============================================================================== --- trunk/storage/libstorage/src/EtcRaidtab.cc (original) +++ trunk/storage/libstorage/src/EtcRaidtab.cc Tue May 26 15:52:03 2009 @@ -3,11 +3,11 @@ Textdomain "storage" */ -#include "y2storage/AppUtil.h" -#include "y2storage/Regex.h" -#include "y2storage/EtcRaidtab.h" -#include "y2storage/AsciiFile.h" -#include "y2storage/Md.h" +#include "storage/AppUtil.h" +#include "storage/Regex.h" +#include "storage/EtcRaidtab.h" +#include "storage/AsciiFile.h" +#include "storage/Md.h" namespace storage Modified: trunk/storage/libstorage/src/EtcRaidtab.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcRaidta… ============================================================================== --- trunk/storage/libstorage/src/EtcRaidtab.h (original) +++ trunk/storage/libstorage/src/EtcRaidtab.h Tue May 26 15:52:03 2009 @@ -4,7 +4,7 @@ #include <string> #include <map> -#include "y2storage/AsciiFile.h" +#include "storage/AsciiFile.h" namespace storage Modified: trunk/storage/libstorage/src/FilterIterator.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/FilterIte… ============================================================================== --- trunk/storage/libstorage/src/FilterIterator.h (original) +++ trunk/storage/libstorage/src/FilterIterator.h Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #ifndef FILTER_ITERATOR_H #define FILTER_ITERATOR_H -#include "y2storage/AppUtil.h" -#include "y2storage/IterPair.h" +#include "storage/AppUtil.h" +#include "storage/IterPair.h" namespace storage { Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?… ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Tue May 26 15:52:03 2009 @@ -13,10 +13,10 @@ #include <boost/algorithm/string.hpp> #include "config.h" -#include "y2storage/Graph.h" -#include "y2storage/AppUtil.h" -#include "y2storage/HumanString.h" -#include "y2storage/StorageInterface.h" +#include "storage/Graph.h" +#include "storage/AppUtil.h" +#include "storage/HumanString.h" +#include "storage/StorageInterface.h" namespace storage Modified: trunk/storage/libstorage/src/ListListIterator.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ListListI… ============================================================================== --- trunk/storage/libstorage/src/ListListIterator.h (original) +++ trunk/storage/libstorage/src/ListListIterator.h Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #ifndef LIST_LIST_ITERATOR_H #define LIST_LIST_ITERATOR_H -#include "y2storage/AppUtil.h" -#include "y2storage/IterPair.h" +#include "storage/AppUtil.h" +#include "storage/IterPair.h" namespace storage { Modified: trunk/storage/libstorage/src/Lock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Lock.cc (original) +++ trunk/storage/libstorage/src/Lock.cc Tue May 26 15:52:03 2009 @@ -11,8 +11,8 @@ #include <sys/types.h> #include <stdlib.h> -#include "y2storage/AppUtil.h" -#include "y2storage/Lock.h" +#include "storage/AppUtil.h" +#include "storage/Lock.h" namespace storage Modified: trunk/storage/libstorage/src/Loop.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Loop.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Loop.cc (original) +++ trunk/storage/libstorage/src/Loop.cc Tue May 26 15:52:03 2009 @@ -6,14 +6,14 @@ #include <sys/stat.h> -#include "y2storage/Loop.h" -#include "y2storage/StorageTypes.h" -#include "y2storage/Container.h" -#include "y2storage/AppUtil.h" -#include "y2storage/ProcPart.h" -#include "y2storage/Storage.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/StorageDefines.h" +#include "storage/Loop.h" +#include "storage/StorageTypes.h" +#include "storage/Container.h" +#include "storage/AppUtil.h" +#include "storage/ProcPart.h" +#include "storage/Storage.h" +#include "storage/SystemCmd.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/Loop.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Loop.h?re… ============================================================================== --- trunk/storage/libstorage/src/Loop.h (original) +++ trunk/storage/libstorage/src/Loop.h Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #ifndef LOOP_H #define LOOP_H -#include "y2storage/Volume.h" +#include "storage/Volume.h" namespace storage { Modified: trunk/storage/libstorage/src/LoopCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LoopCo.cc… ============================================================================== --- trunk/storage/libstorage/src/LoopCo.cc (original) +++ trunk/storage/libstorage/src/LoopCo.cc Tue May 26 15:52:03 2009 @@ -5,15 +5,15 @@ #include <ostream> #include <sstream> -#include "y2storage/LoopCo.h" -#include "y2storage/Loop.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/Dm.h" -#include "y2storage/ProcMounts.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" -#include "y2storage/EtcFstab.h" -#include "y2storage/StorageDefines.h" +#include "storage/LoopCo.h" +#include "storage/Loop.h" +#include "storage/SystemCmd.h" +#include "storage/Dm.h" +#include "storage/ProcMounts.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" +#include "storage/EtcFstab.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/LoopCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LoopCo.h?… ============================================================================== --- trunk/storage/libstorage/src/LoopCo.h (original) +++ trunk/storage/libstorage/src/LoopCo.h Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #ifndef LOOP_CO_H #define LOOP_CO_H -#include "y2storage/Container.h" -#include "y2storage/Loop.h" +#include "storage/Container.h" +#include "storage/Loop.h" namespace storage { Modified: trunk/storage/libstorage/src/LvmLv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmLv.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmLv.cc (original) +++ trunk/storage/libstorage/src/LvmLv.cc Tue May 26 15:52:03 2009 @@ -5,12 +5,12 @@ #include <sstream> #include <boost/algorithm/string.hpp> -#include "y2storage/LvmLv.h" -#include "y2storage/LvmVg.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" -#include "y2storage/StorageDefines.h" +#include "storage/LvmLv.h" +#include "storage/LvmVg.h" +#include "storage/SystemCmd.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/LvmLv.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmLv.h?r… ============================================================================== --- trunk/storage/libstorage/src/LvmLv.h (original) +++ trunk/storage/libstorage/src/LvmLv.h Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #ifndef LVM_LV_H #define LVM_LV_H -#include "y2storage/Dm.h" +#include "storage/Dm.h" namespace storage { Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Tue May 26 15:52:03 2009 @@ -5,12 +5,12 @@ #include <ostream> #include <sstream> -#include "y2storage/LvmVg.h" -#include "y2storage/LvmLv.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" -#include "y2storage/StorageDefines.h" +#include "storage/LvmVg.h" +#include "storage/LvmLv.h" +#include "storage/SystemCmd.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/LvmVg.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.h?r… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.h (original) +++ trunk/storage/libstorage/src/LvmVg.h Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #ifndef LVM_VG_H #define LVM_VG_H -#include "y2storage/PeContainer.h" -#include "y2storage/LvmLv.h" +#include "storage/PeContainer.h" +#include "storage/LvmLv.h" namespace storage Modified: trunk/storage/libstorage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Makefile.… ============================================================================== --- trunk/storage/libstorage/src/Makefile.am (original) +++ trunk/storage/libstorage/src/Makefile.am Tue May 26 15:52:03 2009 @@ -5,12 +5,12 @@ AM_CXXFLAGS = INCLUDES = -I$(includedir) -y2storage: - ln -sf . y2storage +storage: + ln -sf . storage mkdir .libs ln -sf . .libs/plugin -BUILT_SOURCES = y2storage StorageCallbacksBuiltinTable.h StorageCallbacksBuiltinCalls.h +BUILT_SOURCES = storage StorageCallbacksBuiltinTable.h StorageCallbacksBuiltinCalls.h StorageCallbacksBuiltinTable.h : StorageCallbacks.h y2tool generateYCPWrappers StorageCallbacks.h StorageCallbacksBuiltinCalls.h StorageCallbacksBuiltinTable.h @@ -77,7 +77,7 @@ libpy2StorageCallbacks_la_LDFLAGS = -version-info 2:0 libpy2StorageCallbacks_la_LIBADD = -L$(libdir) -ly2 -lycp liby2storage.la -pkgincludedir = $(includedir)/y2storage +pkgincludedir = $(includedir)/storage pkginclude_HEADERS = \ StorageInterface.h \ Modified: trunk/storage/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Md.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Md.cc (original) +++ trunk/storage/libstorage/src/Md.cc Tue May 26 15:52:03 2009 @@ -6,14 +6,14 @@ #include <boost/algorithm/string.hpp> #include <boost/tokenizer.hpp> -#include "y2storage/Md.h" -#include "y2storage/StorageTypes.h" -#include "y2storage/Storage.h" -#include "y2storage/AppUtil.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/Regex.h" -#include "y2storage/Container.h" -#include "y2storage/StorageDefines.h" +#include "storage/Md.h" +#include "storage/StorageTypes.h" +#include "storage/Storage.h" +#include "storage/AppUtil.h" +#include "storage/SystemCmd.h" +#include "storage/Regex.h" +#include "storage/Container.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/Md.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Md.h?rev=… ============================================================================== --- trunk/storage/libstorage/src/Md.h (original) +++ trunk/storage/libstorage/src/Md.h Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #ifndef MD_H #define MD_H -#include "y2storage/StorageInterface.h" -#include "y2storage/Volume.h" +#include "storage/StorageInterface.h" +#include "storage/Volume.h" namespace storage { Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Tue May 26 15:52:03 2009 @@ -5,13 +5,13 @@ #include <ostream> #include <fstream> -#include "y2storage/MdCo.h" -#include "y2storage/Md.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" -#include "y2storage/EtcRaidtab.h" -#include "y2storage/StorageDefines.h" +#include "storage/MdCo.h" +#include "storage/Md.h" +#include "storage/SystemCmd.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" +#include "storage/EtcRaidtab.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/MdCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.h?re… ============================================================================== --- trunk/storage/libstorage/src/MdCo.h (original) +++ trunk/storage/libstorage/src/MdCo.h Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #ifndef MD_CO_H #define MD_CO_H -#include "y2storage/Container.h" -#include "y2storage/Md.h" +#include "storage/Container.h" +#include "storage/Md.h" namespace storage { Modified: trunk/storage/libstorage/src/Nfs.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Nfs.cc?re… ============================================================================== --- trunk/storage/libstorage/src/Nfs.cc (original) +++ trunk/storage/libstorage/src/Nfs.cc Tue May 26 15:52:03 2009 @@ -4,12 +4,12 @@ #include <sstream> -#include "y2storage/Nfs.h" -#include "y2storage/StorageTypes.h" -#include "y2storage/Container.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" -#include "y2storage/SystemCmd.h" +#include "storage/Nfs.h" +#include "storage/StorageTypes.h" +#include "storage/Container.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" +#include "storage/SystemCmd.h" namespace storage Modified: trunk/storage/libstorage/src/Nfs.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Nfs.h?rev… ============================================================================== --- trunk/storage/libstorage/src/Nfs.h (original) +++ trunk/storage/libstorage/src/Nfs.h Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #ifndef NFS_H #define NFS_H -#include "y2storage/Volume.h" +#include "storage/Volume.h" namespace storage { Modified: trunk/storage/libstorage/src/NfsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/NfsCo.cc?… ============================================================================== --- trunk/storage/libstorage/src/NfsCo.cc (original) +++ trunk/storage/libstorage/src/NfsCo.cc Tue May 26 15:52:03 2009 @@ -5,12 +5,12 @@ #include <ostream> #include <sstream> -#include "y2storage/NfsCo.h" -#include "y2storage/Nfs.h" -#include "y2storage/AppUtil.h" -#include "y2storage/ProcMounts.h" -#include "y2storage/Storage.h" -#include "y2storage/EtcFstab.h" +#include "storage/NfsCo.h" +#include "storage/Nfs.h" +#include "storage/AppUtil.h" +#include "storage/ProcMounts.h" +#include "storage/Storage.h" +#include "storage/EtcFstab.h" namespace storage Modified: trunk/storage/libstorage/src/NfsCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/NfsCo.h?r… ============================================================================== --- trunk/storage/libstorage/src/NfsCo.h (original) +++ trunk/storage/libstorage/src/NfsCo.h Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #ifndef NFS_CO_H #define NFS_CO_H -#include "y2storage/Container.h" -#include "y2storage/Nfs.h" +#include "storage/Container.h" +#include "storage/Nfs.h" namespace storage { Modified: trunk/storage/libstorage/src/OutputProcessor.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/OutputPro… ============================================================================== --- trunk/storage/libstorage/src/OutputProcessor.cc (original) +++ trunk/storage/libstorage/src/OutputProcessor.cc Tue May 26 15:52:03 2009 @@ -3,9 +3,9 @@ */ -#include "y2storage/AppUtil.h" -#include "y2storage/StorageTmpl.h" -#include "y2storage/OutputProcessor.h" +#include "storage/AppUtil.h" +#include "storage/StorageTmpl.h" +#include "storage/OutputProcessor.h" namespace storage Modified: trunk/storage/libstorage/src/OutputProcessor.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/OutputPro… ============================================================================== --- trunk/storage/libstorage/src/OutputProcessor.h (original) +++ trunk/storage/libstorage/src/OutputProcessor.h Tue May 26 15:52:03 2009 @@ -2,7 +2,7 @@ #define OUTPUT_PROCESSOR_H -#include "y2storage/StorageInterface.h" +#include "storage/StorageInterface.h" namespace storage Modified: trunk/storage/libstorage/src/Partition.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition… ============================================================================== --- trunk/storage/libstorage/src/Partition.cc (original) +++ trunk/storage/libstorage/src/Partition.cc Tue May 26 15:52:03 2009 @@ -4,10 +4,10 @@ #include <sstream> -#include "y2storage/Partition.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Disk.h" -#include "y2storage/Storage.h" +#include "storage/Partition.h" +#include "storage/AppUtil.h" +#include "storage/Disk.h" +#include "storage/Storage.h" namespace storage Modified: trunk/storage/libstorage/src/Partition.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition… ============================================================================== --- trunk/storage/libstorage/src/Partition.h (original) +++ trunk/storage/libstorage/src/Partition.h Tue May 26 15:52:03 2009 @@ -1,9 +1,9 @@ #ifndef PARTITION_H #define PARTITION_H -#include "y2storage/StorageInterface.h" -#include "y2storage/Volume.h" -#include "y2storage/Region.h" +#include "storage/StorageInterface.h" +#include "storage/Volume.h" +#include "storage/Region.h" namespace storage { Modified: trunk/storage/libstorage/src/PeContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/PeContain… ============================================================================== --- trunk/storage/libstorage/src/PeContainer.cc (original) +++ trunk/storage/libstorage/src/PeContainer.cc Tue May 26 15:52:03 2009 @@ -6,9 +6,9 @@ #include <sstream> #include <utility> -#include "y2storage/PeContainer.h" -#include "y2storage/AppUtil.h" -#include "y2storage/Storage.h" +#include "storage/PeContainer.h" +#include "storage/AppUtil.h" +#include "storage/Storage.h" namespace storage Modified: trunk/storage/libstorage/src/PeContainer.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/PeContain… ============================================================================== --- trunk/storage/libstorage/src/PeContainer.h (original) +++ trunk/storage/libstorage/src/PeContainer.h Tue May 26 15:52:03 2009 @@ -1,8 +1,8 @@ #ifndef PE_CONTAINER_H #define PE_CONTAINER_H -#include "y2storage/Container.h" -#include "y2storage/Dm.h" +#include "storage/Container.h" +#include "storage/Dm.h" namespace storage { Modified: trunk/storage/libstorage/src/ProcMounts.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMount… ============================================================================== --- trunk/storage/libstorage/src/ProcMounts.cc (original) +++ trunk/storage/libstorage/src/ProcMounts.cc Tue May 26 15:52:03 2009 @@ -4,13 +4,13 @@ */ -#include "y2storage/AppUtil.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/AsciiFile.h" -#include "y2storage/ProcMounts.h" -#include "y2storage/StorageTmpl.h" -#include "y2storage/Storage.h" -#include "y2storage/StorageDefines.h" +#include "storage/AppUtil.h" +#include "storage/SystemCmd.h" +#include "storage/AsciiFile.h" +#include "storage/ProcMounts.h" +#include "storage/StorageTmpl.h" +#include "storage/Storage.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/ProcMounts.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMount… ============================================================================== --- trunk/storage/libstorage/src/ProcMounts.h (original) +++ trunk/storage/libstorage/src/ProcMounts.h Tue May 26 15:52:03 2009 @@ -5,7 +5,7 @@ #include <list> #include <map> -#include "y2storage/EtcFstab.h" +#include "storage/EtcFstab.h" namespace storage { Modified: trunk/storage/libstorage/src/ProcPart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcPart.… ============================================================================== --- trunk/storage/libstorage/src/ProcPart.cc (original) +++ trunk/storage/libstorage/src/ProcPart.cc Tue May 26 15:52:03 2009 @@ -4,10 +4,10 @@ */ -#include "y2storage/AppUtil.h" -#include "y2storage/StorageTmpl.h" -#include "y2storage/AsciiFile.h" -#include "y2storage/ProcPart.h" +#include "storage/AppUtil.h" +#include "storage/StorageTmpl.h" +#include "storage/AsciiFile.h" +#include "storage/ProcPart.h" namespace storage Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue May 26 15:52:03 2009 @@ -21,22 +21,22 @@ #include <boost/algorithm/string.hpp> #include "config.h" -#include "y2storage/Storage.h" -#include "y2storage/StorageTmpl.h" -#include "y2storage/AppUtil.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/Disk.h" -#include "y2storage/Dasd.h" -#include "y2storage/MdCo.h" -#include "y2storage/DmCo.h" -#include "y2storage/LoopCo.h" -#include "y2storage/LvmVg.h" -#include "y2storage/IterPair.h" -#include "y2storage/ProcMounts.h" -#include "y2storage/ProcPart.h" -#include "y2storage/EtcFstab.h" -#include "y2storage/AsciiFile.h" -#include "y2storage/StorageDefines.h" +#include "storage/Storage.h" +#include "storage/StorageTmpl.h" +#include "storage/AppUtil.h" +#include "storage/SystemCmd.h" +#include "storage/Disk.h" +#include "storage/Dasd.h" +#include "storage/MdCo.h" +#include "storage/DmCo.h" +#include "storage/LoopCo.h" +#include "storage/LvmVg.h" +#include "storage/IterPair.h" +#include "storage/ProcMounts.h" +#include "storage/ProcPart.h" +#include "storage/EtcFstab.h" +#include "storage/AsciiFile.h" +#include "storage/StorageDefines.h" namespace storage Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Tue May 26 15:52:03 2009 @@ -5,31 +5,31 @@ #include <list> #include <map> -#include "y2storage/StorageInterface.h" -#include "y2storage/StorageTypes.h" -#include "y2storage/StorageTmpl.h" -#include "y2storage/Container.h" -#include "y2storage/Volume.h" -#include "y2storage/Disk.h" -#include "y2storage/Partition.h" -#include "y2storage/LvmVg.h" -#include "y2storage/LvmLv.h" -#include "y2storage/DmraidCo.h" -#include "y2storage/Dmraid.h" -#include "y2storage/DmmultipathCo.h" -#include "y2storage/Dmmultipath.h" -#include "y2storage/MdCo.h" -#include "y2storage/Md.h" -#include "y2storage/DmCo.h" -#include "y2storage/LoopCo.h" -#include "y2storage/Loop.h" -#include "y2storage/NfsCo.h" -#include "y2storage/Nfs.h" -#include "y2storage/FilterIterator.h" -#include "y2storage/DerefIterator.h" -#include "y2storage/ListListIterator.h" -#include "y2storage/IterPair.h" -#include "y2storage/Lock.h" +#include "storage/StorageInterface.h" +#include "storage/StorageTypes.h" +#include "storage/StorageTmpl.h" +#include "storage/Container.h" +#include "storage/Volume.h" +#include "storage/Disk.h" +#include "storage/Partition.h" +#include "storage/LvmVg.h" +#include "storage/LvmLv.h" +#include "storage/DmraidCo.h" +#include "storage/Dmraid.h" +#include "storage/DmmultipathCo.h" +#include "storage/Dmmultipath.h" +#include "storage/MdCo.h" +#include "storage/Md.h" +#include "storage/DmCo.h" +#include "storage/LoopCo.h" +#include "storage/Loop.h" +#include "storage/NfsCo.h" +#include "storage/Nfs.h" +#include "storage/FilterIterator.h" +#include "storage/DerefIterator.h" +#include "storage/ListListIterator.h" +#include "storage/IterPair.h" +#include "storage/Lock.h" namespace storage { Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue May 26 15:52:03 2009 @@ -69,7 +69,7 @@ * * \code * - * #include <y2storage/StorageInterface.h> + * #include <storage/StorageInterface.h> * * using namespace storage; * Modified: trunk/storage/libstorage/src/StorageTmpl.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTm… ============================================================================== --- trunk/storage/libstorage/src/StorageTmpl.h (original) +++ trunk/storage/libstorage/src/StorageTmpl.h Tue May 26 15:52:03 2009 @@ -8,10 +8,10 @@ #include <map> #include <deque> -#include "y2storage/IterPair.h" -#include "y2storage/FilterIterator.h" -#include "y2storage/DerefIterator.h" -#include "y2storage/AppUtil.h" +#include "storage/IterPair.h" +#include "storage/FilterIterator.h" +#include "storage/DerefIterator.h" +#include "storage/AppUtil.h" namespace storage { Modified: trunk/storage/libstorage/src/StorageTypes.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTy… ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.cc (original) +++ trunk/storage/libstorage/src/StorageTypes.cc Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ -#include "y2storage/Storage.h" -#include "y2storage/StorageTypes.h" -#include "y2storage/Volume.h" +#include "storage/Storage.h" +#include "storage/StorageTypes.h" +#include "storage/Volume.h" namespace storage Modified: trunk/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTy… ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.h (original) +++ trunk/storage/libstorage/src/StorageTypes.h Tue May 26 15:52:03 2009 @@ -7,9 +7,9 @@ #include <ostream> #include <boost/algorithm/string.hpp> -#include "y2storage/Regex.h" -#include "y2storage/AppUtil.h" -#include "y2storage/StorageInterface.h" +#include "storage/Regex.h" +#include "storage/AppUtil.h" +#include "storage/StorageInterface.h" namespace storage Modified: trunk/storage/libstorage/src/SystemCmd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.cc (original) +++ trunk/storage/libstorage/src/SystemCmd.cc Tue May 26 15:52:03 2009 @@ -14,9 +14,9 @@ #include <string> #include <boost/algorithm/string.hpp> -#include "y2storage/AppUtil.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/OutputProcessor.h" +#include "storage/AppUtil.h" +#include "storage/SystemCmd.h" +#include "storage/OutputProcessor.h" namespace storage Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Tue May 26 15:52:03 2009 @@ -8,20 +8,20 @@ #include <sstream> #include <fstream> -#include "y2storage/Volume.h" -#include "y2storage/Disk.h" -#include "y2storage/LoopCo.h" -#include "y2storage/Storage.h" -#include "y2storage/StorageTypes.h" -#include "y2storage/Container.h" -#include "y2storage/AppUtil.h" -#include "y2storage/SystemCmd.h" -#include "y2storage/ProcMounts.h" -#include "y2storage/ProcPart.h" -#include "y2storage/OutputProcessor.h" -#include "y2storage/EtcFstab.h" -#include "y2storage/StorageDefines.h" -#include "y2storage/HumanString.h" +#include "storage/Volume.h" +#include "storage/Disk.h" +#include "storage/LoopCo.h" +#include "storage/Storage.h" +#include "storage/StorageTypes.h" +#include "storage/Container.h" +#include "storage/AppUtil.h" +#include "storage/SystemCmd.h" +#include "storage/ProcMounts.h" +#include "storage/ProcPart.h" +#include "storage/OutputProcessor.h" +#include "storage/EtcFstab.h" +#include "storage/StorageDefines.h" +#include "storage/HumanString.h" namespace storage Modified: trunk/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.h?… ============================================================================== --- trunk/storage/libstorage/src/Volume.h (original) +++ trunk/storage/libstorage/src/Volume.h Tue May 26 15:52:03 2009 @@ -1,9 +1,9 @@ #ifndef VOLUME_H #define VOLUME_H -#include "y2storage/StorageInterface.h" -#include "y2storage/StorageTypes.h" -#include "y2storage/StorageTmpl.h" +#include "storage/StorageInterface.h" +#include "storage/StorageTypes.h" +#include "storage/StorageTmpl.h" namespace storage { Modified: trunk/storage/libstorage/testsuite-real/lvmcreate1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite-rea… ============================================================================== --- trunk/storage/libstorage/testsuite-real/lvmcreate1.cc (original) +++ trunk/storage/libstorage/testsuite-real/lvmcreate1.cc Tue May 26 15:52:03 2009 @@ -2,7 +2,7 @@ #include <stdlib.h> #include <iostream> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using namespace storage; using namespace std; Modified: trunk/storage/libstorage/testsuite-real/lvmcreate2.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite-rea… ============================================================================== --- trunk/storage/libstorage/testsuite-real/lvmcreate2.cc (original) +++ trunk/storage/libstorage/testsuite-real/lvmcreate2.cc Tue May 26 15:52:03 2009 @@ -2,7 +2,7 @@ #include <stdlib.h> #include <iostream> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using namespace storage; using namespace std; Modified: trunk/storage/libstorage/testsuite-real/lvmextend1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite-rea… ============================================================================== --- trunk/storage/libstorage/testsuite-real/lvmextend1.cc (original) +++ trunk/storage/libstorage/testsuite-real/lvmextend1.cc Tue May 26 15:52:03 2009 @@ -2,7 +2,7 @@ #include <stdlib.h> #include <iostream> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using namespace storage; using namespace std; Modified: trunk/storage/libstorage/testsuite-real/lvmextend2.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite-rea… ============================================================================== --- trunk/storage/libstorage/testsuite-real/lvmextend2.cc (original) +++ trunk/storage/libstorage/testsuite-real/lvmextend2.cc Tue May 26 15:52:03 2009 @@ -2,7 +2,7 @@ #include <stdlib.h> #include <iostream> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using namespace storage; using namespace std; Modified: trunk/storage/libstorage/testsuite/common.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/com… ============================================================================== --- trunk/storage/libstorage/testsuite/common.h (original) +++ trunk/storage/libstorage/testsuite/common.h Tue May 26 15:52:03 2009 @@ -1,7 +1,7 @@ #include <string> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> using std::string; Modified: trunk/storage/libstorage/testsuite/format1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/for… ============================================================================== --- trunk/storage/libstorage/testsuite/format1.cc (original) +++ trunk/storage/libstorage/testsuite/format1.cc Tue May 26 15:52:03 2009 @@ -3,7 +3,7 @@ #include <iostream> #include <iterator> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> #include "common.h" Modified: trunk/storage/libstorage/testsuite/humanstring1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/hum… ============================================================================== --- trunk/storage/libstorage/testsuite/humanstring1.cc (original) +++ trunk/storage/libstorage/testsuite/humanstring1.cc Tue May 26 15:52:03 2009 @@ -2,7 +2,7 @@ #include <iostream> #include <locale> -#include <y2storage/HumanString.h> +#include <storage/HumanString.h> using namespace std; using namespace storage; Modified: trunk/storage/libstorage/testsuite/humanstring2.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/hum… ============================================================================== --- trunk/storage/libstorage/testsuite/humanstring2.cc (original) +++ trunk/storage/libstorage/testsuite/humanstring2.cc Tue May 26 15:52:03 2009 @@ -2,7 +2,7 @@ #include <iostream> #include <locale> -#include <y2storage/HumanString.h> +#include <storage/HumanString.h> using namespace std; using namespace storage; Modified: trunk/storage/libstorage/testsuite/partition1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/par… ============================================================================== --- trunk/storage/libstorage/testsuite/partition1.cc (original) +++ trunk/storage/libstorage/testsuite/partition1.cc Tue May 26 15:52:03 2009 @@ -3,7 +3,7 @@ #include <iostream> #include <iterator> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> #include "common.h" Modified: trunk/storage/libstorage/testsuite/uuid1.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/uui… ============================================================================== --- trunk/storage/libstorage/testsuite/uuid1.cc (original) +++ trunk/storage/libstorage/testsuite/uuid1.cc Tue May 26 15:52:03 2009 @@ -4,7 +4,7 @@ #include <fstream> #include <iterator> -#include <y2storage/StorageInterface.h> +#include <storage/StorageInterface.h> #include "common.h" -- 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] r57317 - /trunk/storage/storage/src/include/ep-hd.ycp
by kmachalkova＠svn.opensuse.org 26 May '09

26 May '09

Author: kmachalkova Date: Tue May 26 15:06:54 2009 New Revision: 57317 URL: http://svn.opensuse.org/viewcvs/yast?rev=57317&view=rev Log: Do not let extended partitions into the while-loop, treat them as unpartitioned space (gparted does it too). And we have no means of visualizing extended p. container anyway :( Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Tue May 26 15:06:54 2009 @@ -283,8 +283,17 @@ list <string> labels = []; string emptyspace = _("Unpartitioned Space"); - // Clean disk - if (isempty(ddata["partitions"]:[])) + // Filter out extended partitions + list <map> partitions = (list <map>) filter ( map one_part, ddata["partitions"]:[], { + return ( (one_part["type"]:`none == `primary) || (one_part["type"]:`none == `logical) ); + }); + // and sort the remaining ones by start cyl + partitions = (list <map> ) sort (map m, map n, partitions, { + return Region::Start( m["region"]:[] ) < Region::Start( n["region"]:[] ); + }); + + // Clean disk (or 1 big extended partition) + if (isempty(partitions)) { bits = [100]; labels = [ emptyspace + "\n" + Storage::KByteToHumanString(ddata["size_k"]:0)]; @@ -292,25 +301,14 @@ else { integer i = 0; - integer part_count = size(ddata["partitions"]:[]); + integer part_count = size(partitions); integer ccyl = 0; integer endcyl = ddata["cyl_count"]:1; - list <map> partitions = (list <map> ) sort (map m, map n, ddata["partitions"]:[], { - return Region::Start( m["region"]:[] ) < Region::Start( n["region"]:[] ); - }); - while(ccyl < endcyl) { map part = partitions[ i ]:$[]; - // skip extended ones - if ( part["type"]:`primary == `extended) - { - i = i+1; - continue; - } - - list <integer> region = ddata["partitions", i, "region"]:[]; + list <integer> region = partitions[ i, "region" ]:[]; ccyl = Region::Start( region ); integer next_cyl = 0; @@ -322,7 +320,7 @@ // somewhere in the middle, look where the next partition starts else { - next_cyl = Region::Start( ddata["partitions", i+1, "region"]:[] ); + next_cyl = Region::Start( partitions[ i+1, "region" ]:[] ); } integer tmp = 100*Region::Length( region )/ddata["cyl_count"]:1; //in % @@ -338,7 +336,7 @@ // or the end of the disk if // 1. end +1th cyl is not the next one // 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder) - if ( (Region::End( region ) != next_cyl) && + if ( ( Region::End( region ) != next_cyl ) && ( (Region::End( region) + 1) != next_cyl ) ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0