August 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r49907 - /branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 11 Aug '08

11 Aug '08

Author: lslezak Date: Mon Aug 11 09:06:00 2008 New Revision: 49907 URL: http://svn.opensuse.org/viewcvs/yast?rev=49907&view=rev Log: - try to download PPC boot files even if file list downloading fails Modified: branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp Mon Aug 11 09:06:00 2008 @@ -1065,84 +1065,66 @@ boolean CopyPPCBoot(integer srcid, string target) { y2milestone("Copying PPC boot files"); + boolean ret = true; + + y2milestone("Copying /ppc subdirectory"); + boolean r = CopyDirectoryRecOpt(srcid, 1, "/ppc", target); - list<string> lst = GetList(srcid, 1, ""); - if (lst == nil) + if (!r) { - lst = []; + y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt"); + CopyFile(srcid, 1, "/ppc/bootinfo.txt", target + "/ppc"); } - boolean ret = true; + ret = ret && r; - if (contains(lst, "ppc/")) - { - y2milestone("Copying /ppc subdirectory"); - boolean r = CopyDirectoryRecOpt(srcid, 1, "/ppc", target); - if (!r) - { - y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt"); - CopyFile(srcid, 1, "/ppc/bootinfo.txt", target + "/ppc"); - } + y2milestone("Copying /PS3 subdirectory"); + r = CopyDirectoryRecOpt(srcid, 1, "/PS3", target); - ret = ret && r; + if (!r) + { + y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt"); + Exec(sformat("/bin/mkdir -p '%1/PS3/otheros'", String::Quote(target))); + CopyFile(srcid, 1, "/PS3/otheros/otheros.bld", target + "/PS3/otheros"); } - if (contains(lst, "PS3/")) - { - y2milestone("Copying /ppc subdirectory"); - boolean r = CopyDirectoryRecOpt(srcid, 1, "/PS3", target); + ret = ret && r; - if (!r) - { - y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt"); - Exec(sformat("/bin/mkdir -p '%1/PS3/otheros'", String::Quote(target))); - CopyFile(srcid, 1, "/PS3/otheros/otheros.bld", target + "/PS3/otheros"); - } - ret = ret && r; - } + y2milestone("Copying /suseboot subdirectory"); + r = CopyDirectoryRecOpt(srcid, 1, "/suseboot", target); + y2milestone("Result: %1", r); - if (contains(lst, "suseboot/")) + if (!r) { - y2milestone("Copying /suseboot subdirectory"); - boolean r = CopyDirectoryRecOpt(srcid, 1, "/suseboot", target); - y2milestone("Result: %1", r); - - if (!r) - { - list<string> files = [ - "/suseboot/inst32", "/suseboot/inst64", "/suseboot/os-chooser", - "/suseboot/yaboot", "/suseboot/yaboot.cnf", "/suseboot/yaboot.ibm", - "/suseboot/yaboot.txt" - ]; + list<string> files = [ + "/suseboot/inst32", "/suseboot/inst64", "/suseboot/os-chooser", + "/suseboot/yaboot", "/suseboot/yaboot.cnf", "/suseboot/yaboot.ibm", + "/suseboot/yaboot.txt" + ]; - y2milestone("Directory listing may be missing using fixed list: %1", files); + y2milestone("Directory listing may be missing using fixed list: %1", files); - foreach(string f, files, - { - CopyFile(srcid, 1, f, target + f); - } - ); - } - - ret = ret && r; + foreach(string f, files, + { + CopyFile(srcid, 1, f, target + f); + } + ); } - if (contains(lst, "etc/")) - { - y2milestone("Copying /etc subdirectory"); - boolean r = CopyDirectoryRecOpt(srcid, 1, "/etc", target); - if (!r) - { - y2milestone("Directory listing may be missing, copying /etc/yaboot.conf"); - CopyFile(srcid, 1, "/etc/yaboot.conf", target + "/etc"); - } + y2milestone("Copying /etc subdirectory"); + r = CopyDirectoryRecOpt(srcid, 1, "/etc", target); - ret = ret && r; + if (!r) + { + y2milestone("Directory listing may be missing, copying /etc/yaboot.conf"); + CopyOptionalFile(srcid, 1, "/etc/yaboot.conf", target + "/etc"); } + ret = ret && r; + return ret; } -- 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] r49906 - /trunk/storage/libstorage/src/AppUtil.h
by aschnell＠svn.opensuse.org 10 Aug '08

10 Aug '08

Author: aschnell Date: Mon Aug 11 00:07:15 2008 New Revision: 49906 URL: http://svn.opensuse.org/viewcvs/yast?rev=49906&view=rev Log: - use scope operator in define Modified: trunk/storage/libstorage/src/AppUtil.h Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Mon Aug 11 00:07:15 2008 @@ -81,9 +81,9 @@ #define y2log_op(level, file, line, function, op) \ do { \ std::ostringstream __buf; \ - classic(__buf); \ + storage::classic(__buf); \ __buf << op; \ - logMsg(level, file, line, function, __buf.str()); \ + storage::logMsg(level, file, line, function, __buf.str()); \ } while (0) -- 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] r49905 - in /trunk/storage/libstorage/src: AppUtil.h Disk.cc
by aschnell＠svn.opensuse.org 10 Aug '08

10 Aug '08

Author: aschnell Date: Sun Aug 10 23:49:11 2008 New Revision: 49905 URL: http://svn.opensuse.org/viewcvs/yast?rev=49905&view=rev Log: - imbue stream with classic locale (workaround for bug #416096) Modified: trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/Disk.cc Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Sun Aug 10 23:49:11 2008 @@ -8,6 +8,7 @@ #include <cstdio> #include <fstream> #include <sstream> +#include <locale> #include <string> #include <list> #include <map> @@ -45,6 +46,14 @@ bool isNfsDev( const string& dev ); unsigned getMajorDevices( const string& driver ); + +template<class StreamType> +void classic(StreamType& stream) +{ + stream.imbue(std::locale::classic()); +} + + void createLogger(const string& component, const string& name, const string& logpath, const string& logfile); @@ -72,17 +81,21 @@ #define y2log_op(level, file, line, function, op) \ do { \ std::ostringstream __buf; \ + classic(__buf); \ __buf << op; \ logMsg(level, file, line, function, __buf.str()); \ } while (0) + string sformat(const char* format, ...); + string byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes); bool humanStringToByte(const string& str, bool classic, unsigned long long& size); + inline const char* _(const char* msgid) { return dgettext("storage", msgid); @@ -93,6 +106,7 @@ return dngettext("storage", msgid, msgid_plural, n); } + extern const string app_ws; } 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 Sun Aug 10 23:49:11 2008 @@ -626,6 +626,7 @@ y2debug( "Line: %s", Line.c_str() ); std::istringstream Data( Line ); + classic(Data); nr=0; StartM = EndM = 0; @@ -639,7 +640,7 @@ { Data >> nr >> StartM >> skip >> EndM >> skip >> skip; } - if( !Data.good() ) + if (Data.fail()) { y2mil( "invalid line:" << Line ); nr = 0; -- 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] r49904 - /trunk/storage/libstorage/src/StorageInterface.h
by aschnell＠svn.opensuse.org 10 Aug '08

10 Aug '08

Author: aschnell Date: Sun Aug 10 21:56:26 2008 New Revision: 49904 URL: http://svn.opensuse.org/viewcvs/yast?rev=49904&view=rev Log: - added notes Modified: trunk/storage/libstorage/src/StorageInterface.h 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 Sun Aug 10 21:56:26 2008 @@ -171,7 +171,7 @@ string device; string name; UsedByType usedByType; - string usedByName; + string usedByName; // deprecated string usedByDevice; bool readonly; }; @@ -245,7 +245,7 @@ string mount; MountByType mount_by; UsedByType usedByType; - string usedByName; + string usedByName; // deprecated string usedByDevice; string fstab_options; string uuid; @@ -1593,8 +1593,8 @@ /** * Compute the size of a raid device. * - * The size compute may not be accurate. It should not be used for - * further computations. + * The size compute may not be accurate. It must not be used for + * further computations. Do not used in new code. * * @param md_type raid type of the software raid * @param devices list with physical devices for the software raid -- 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] r49903 - in /trunk/storage/storage/src/include: ep-hd-dialogs.ycp ep-loop-dialogs.ycp ep-lvm-dialogs.ycp
by aschnell＠svn.opensuse.org 10 Aug '08

10 Aug '08

Author: aschnell Date: Sun Aug 10 21:55:46 2008 New Revision: 49903 URL: http://svn.opensuse.org/viewcvs/yast?rev=49903&view=rev Log: - use placeholders for sizes in texts Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-loop-dialogs.ycp trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Sun Aug 10 21:55:46 2008 @@ -132,7 +132,9 @@ string tmp = (string) UI::QueryWidget(`id(`size_input), `Value); if (!Storage::HumanStringToKByte(tmp, size_k)) { - Error(_("The size entered is invalid. Enter a value like \"500MB\" or \"1GB\".")); + Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), + Storage::KByteToHumanString(500*1024), + Storage::KByteToHumanString(1024*1024))); widget = `again; } else if (size_k < min_size_k || size_k > max_size_k) Modified: trunk/storage/storage/src/include/ep-loop-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-loop-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-loop-dialogs.ycp Sun Aug 10 21:55:46 2008 @@ -100,7 +100,8 @@ string tmp = (string) UI::QueryWidget(`id(`size), `Value); if (!Storage::HumanStringToKByte(tmp, size_k)) { - Error(_("The size entered is invalid. Enter a value like \"500MB\" or \"1GB\".")); + Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), + Storage::KByteToHumanString(500*1024), Storage::KByteToHumanString(1024*1024))); widget = `again; } else if (size_k < min_size_k) Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Sun Aug 10 21:55:46 2008 @@ -70,8 +70,11 @@ { if (!Integer::IsPowerOfTwo(pe_size) || pe_size < 1024) { - Error(_("The data entered is invalid. Insert a physical extent size larger than 1kB -in powers of 2, for example, \"512kB\" or \"4MB\"")); + Error(sformat(_("The data entered is invalid. Insert a physical extent size larger than %1 +in powers of 2, for example, \"%2\" or \"%3\""), + Storage::KByteToHumanStringWithPrecision(1, 1, true), + Storage::KByteToHumanStringWithPrecision(4, 1, true), + Storage::KByteToHumanStringWithPrecision(4*1024, 1, true))); return false; } else @@ -163,7 +166,8 @@ }); contents = add(contents, `Left(`InputField(`id("vgname"), "Volume Group Name"))); - contents = add(contents, `Left(`ComboBoxSelected(`id("pesize"), `opt(`editable), _("&Physical Extent Size"), pesizes_list, `id(pesize)))); + contents = add(contents, `Left(`ComboBoxSelected(`id("pesize"), `opt(`editable), + _("&Physical Extent Size"), pesizes_list, `id(pesize)))); contents = add(contents, DevicesSelectionBox::Create(unused_pvs, [], fields, nil, _("Available Physical Volumes:"), @@ -379,7 +383,8 @@ string tmp = (string) UI::QueryWidget(`id(`size_input), `Value); if (!Storage::HumanStringToKByte(tmp, size_k)) { - Error(_("The size entered is invalid. Enter a value like \"500MB\" or \"1GB\".")); + Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), + Storage::KByteToHumanString(500*1024), Storage::KByteToHumanString(1024*1024))); widget = `again; } else if (size_k < min_size_k || size_k > max_size_k) -- 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] r49902 - /trunk/storage/storage/src/include/ep-raid-dialogs.ycp
by aschnell＠svn.opensuse.org 10 Aug '08

10 Aug '08

Author: aschnell Date: Sun Aug 10 21:52:04 2008 New Revision: 49902 URL: http://svn.opensuse.org/viewcvs/yast?rev=49902&view=rev Log: - correct abbreviation of kilobyte Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Sun Aug 10 21:52:04 2008 @@ -179,8 +179,8 @@ // help text string help = _("chunk size: It is the smallest \"atomic\" mass -of data that can be written to the devices. A reasonable chunk size for RAID 5 is 128KB. For RAID 0, -32 KB is a good starting point. For RAID 1, the chunk size does not affect the array very much. +of data that can be written to the devices. A reasonable chunk size for RAID 5 is 128 kB. For RAID 0, +32 kB is a good starting point. For RAID 1, the chunk size does not affect the array very much. "); // help text -- 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] r49901 - in /trunk/storage/libstorage/src: Disk.cc DmCo.cc LoopCo.cc LvmVg.cc MdCo.cc NfsCo.cc
by aschnell＠svn.opensuse.org 09 Aug '08

09 Aug '08

Author: aschnell Date: Sat Aug 9 13:42:48 2008 New Revision: 49901 URL: http://svn.opensuse.org/viewcvs/yast?rev=49901&view=rev Log: - cleanup Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/LoopCo.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/NfsCo.cc 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 Sat Aug 9 13:42:48 2008 @@ -2717,7 +2717,7 @@ } } else - y2mil( "" << log ); + y2mil(log); } bool Disk::equalContent( const Container& rhs ) const 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 Sat Aug 9 13:42:48 2008 @@ -343,7 +343,7 @@ void DmCo::logDifference( const Container& d ) const { - y2mil( "" << getDiffString( d )); + y2mil(getDiffString(d)); const DmCo * p = dynamic_cast<const DmCo*>(&d); if( p != NULL ) { 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 Sat Aug 9 13:42:48 2008 @@ -348,7 +348,7 @@ void LoopCo::logDifference( const Container& d ) const { - y2mil( "" << getDiffString( d )); + y2mil(getDiffString(d)); const LoopCo * p = dynamic_cast<const LoopCo*>(&d); if( p != NULL ) { 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 Sat Aug 9 13:42:48 2008 @@ -1488,7 +1488,7 @@ } } else - y2mil( "" << Container::getDiffString(d) ); + y2mil(Container::getDiffString(d)); } bool LvmVg::equalContent( const Container& rhs ) const 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 Sat Aug 9 13:42:48 2008 @@ -719,7 +719,7 @@ void MdCo::logDifference( const Container& d ) const { - y2mil( "" << getDiffString( d )); + y2mil(getDiffString(d)); const MdCo * p = dynamic_cast<const MdCo*>(&d); if( p != NULL ) { 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 Sat Aug 9 13:42:48 2008 @@ -221,7 +221,7 @@ void NfsCo::logDifference( const Container& d ) const { - y2mil( "" << Container::getDiffString( d )); + y2mil(Container::getDiffString(d)); const NfsCo* p = dynamic_cast<const NfsCo*>(&d); if( p != NULL ) { -- 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] r49900 - /tags/stable-2_17_15/storage/
by aschnell＠svn.opensuse.org 09 Aug '08

09 Aug '08

Author: aschnell Date: Sat Aug 9 11:14:12 2008 New Revision: 49900 URL: http://svn.opensuse.org/viewcvs/yast?rev=49900&view=rev Log: Created tag stable-2_17_15 for storage Added: tags/stable-2_17_15/storage/ - copied from r49899, trunk/storage/ -- 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] r49899 - in /trunk/storage: ./ libstorage/src/ package/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 09 Aug '08

09 Aug '08

Author: aschnell Date: Sat Aug 9 10:45:50 2008 New Revision: 49899 URL: http://svn.opensuse.org/viewcvs/yast?rev=49899&view=rev Log: - added usedByDevice in StorageInterface.h - added "used_by_device" in target map Modified: trunk/storage/VERSION trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Container.h trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/StorageTypes.cc trunk/storage/libstorage/src/StorageTypes.h trunk/storage/libstorage/src/Volume.cc trunk/storage/libstorage/src/Volume.h trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-lvm-dialogs.ycp trunk/storage/storage/src/include/ep-raid-dialogs.ycp trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49899&r1=498… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Sat Aug 9 10:45:50 2008 @@ -1 +1 @@ -2.17.14 +2.17.15 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 Sat Aug 9 10:45:50 2008 @@ -285,8 +285,9 @@ info.name = name(); info.device = device(); info.volcnt = vp.length(); - info.usedBy = getUsedByType(); - info.usedByName = usedByName(); + info.usedByType = uby.type(); + info.usedByName = uby.name(); + info.usedByDevice = uby.device(); info.readonly = readonly(); } 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 Sat Aug 9 10:45:50 2008 @@ -146,7 +146,6 @@ void setUsedBy(storage::UsedByType ub_type, const string& ub_name) { uby.set(ub_type, ub_name); } const storage::usedBy& getUsedBy() const { return uby; } storage::UsedByType getUsedByType() const { return uby.type(); } - const string& usedByName() const { return uby.name(); } bool readonly() const { return ronly; } unsigned long minorNr() const { return mnr; } 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 Sat Aug 9 10:45:50 2008 @@ -4934,24 +4934,23 @@ int Storage::removeUsing(const string& device, const storage::usedBy& uby) { y2mil("device:" << device << " uby:" << uby); - string name = uby.name(); int ret=0; switch( uby.type() ) { case UB_MD: - ret = removeVolume( "/dev/" + name ); + ret = removeVolume(uby.device()); break; case UB_DM: - ret = removeVolume( "/dev/mapper/" + name ); + ret = removeVolume(uby.device()); break; case UB_LVM: - ret = removeLvmVg( name ); + ret = removeLvmVg(uby.name()); break; case UB_DMRAID: //ret = removeDmraidCo( name ); break; case UB_NONE: - y2warning( "%s used by none", device.c_str() ); + y2war(device << " used by none"); break; default: ret = STORAGE_REMOVE_USING_UNKNOWN_TYPE; 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 Sat Aug 9 10:45:50 2008 @@ -170,8 +170,9 @@ unsigned volcnt; string device; string name; - UsedByType usedBy; + UsedByType usedByType; string usedByName; + string usedByDevice; bool readonly; }; @@ -243,8 +244,9 @@ string device; string mount; MountByType mount_by; - UsedByType usedBy; + UsedByType usedByType; string usedByName; + string usedByDevice; string fstab_options; string uuid; string label; 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 Sat Aug 9 10:45:50 2008 @@ -52,6 +52,24 @@ } + const string usedBy::device() const + { + switch (ub_type) + { + case UB_NONE: + return ""; + + case UB_LVM: + case UB_MD: + case UB_DMRAID: + return "/dev/" + ub_name; + + case UB_DM: + return "/dev/mapper/" + ub_name; + } + } + + usedBy::operator string() const { string st; 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 Sat Aug 9 10:45:50 2008 @@ -100,6 +100,8 @@ class usedBy { + // TODO: save device instead of name? + public: usedBy() : ub_type(storage::UB_NONE) {} usedBy(storage::UsedByType type, const string& name) : ub_type(type), ub_name(name) {} @@ -117,8 +119,9 @@ storage::UsedByType type() const { return ub_type; } const string& name() const { return ub_name; } + const string device() const; - friend std::ostream& operator<< (std::ostream&, const usedBy&); + friend std::ostream& operator<<(std::ostream&, const usedBy&); private: storage::UsedByType ub_type; 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 Sat Aug 9 10:45:50 2008 @@ -2695,8 +2695,9 @@ info.device = dev; info.mount = mp; info.mount_by = mount_by; - info.usedBy = uby.type(); + info.usedByType = uby.type(); info.usedByName = uby.name(); + info.usedByDevice = uby.device(); info.fstab_options = fstab_opt; info.uuid = uuid; info.label = label; 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 Sat Aug 9 10:45:50 2008 @@ -56,7 +56,6 @@ void setUsedBy(storage::UsedByType ub_type, const string& ub_name) { uby.set(ub_type, ub_name); } const storage::usedBy& getUsedBy() const { return uby; } storage::UsedByType getUsedByType() const { return uby.type(); } - const string& usedByName() const { return uby.name(); } void getFsInfo( const Volume* source ); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Sat Aug 9 10:45:50 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Aug 09 10:42:06 CEST 2008 - aschnell(a)suse.de + +- added usedByDevice in StorageInterface.h +- version 2.17.15 + +------------------------------------------------------------------- Fri Aug 08 21:56:00 CEST 2008 - aschnell(a)suse.de - added tab with used devices for device mapper devices @@ -7,7 +13,7 @@ ------------------------------------------------------------------- Fri Aug 08 15:01:11 CEST 2008 - aschnell(a)suse.de -- integrated redesigned expert partitioner into installation +- integrated redesigned expert partitioner into installation workflow - version 2.17.13 @@ -103,7 +109,7 @@ - do not attempt to install yast2-iscsi-client during installation (bnc #392972) -- version 2.16.24 +- version 2.16.24 ------------------------------------------------------------------- Mon May 19 10:45:02 CEST 2008 - aschnell(a)suse.de Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Sat Aug 9 10:45:50 2008 @@ -229,8 +229,8 @@ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size ]); map<string, map> target_map = Storage::GetTargetMap(); - list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by"]:"" == ""; }); - list<map> used_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by"]:"" == vgname; }); + list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by_device"]:"" == ""; }); + list<map> used_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by_device"]:"" == "/dev/" + vgname; }); term contents = `VBox(); Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Sat Aug 9 10:45:50 2008 @@ -267,8 +267,8 @@ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size ]); map<string, map> target_map = Storage::GetTargetMap(); - list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by"]:"" == ""; }); - list<map> used_devices = filter(map dev, get_possible_rds(target_map), { return "/dev/" + dev["used_by"]:"" == device; }); + list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by_device"]:"" == ""; }); + list<map> used_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by_device"]:"" == device; }); term contents = `VBox(); Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Sat Aug 9 10:45:50 2008 @@ -51,11 +51,11 @@ global boolean no_fsid_menu = Arch::s390 (); - global string raid_name = "MD Raid"; + global string raid_name = "MD RAID"; global string lv_name = "LV"; global string dm_name = "DM"; global string loop_name = "Loop Device"; - global string dmraid_name = "DM Raid"; + global string dmraid_name = "DM RAID"; global string nfs_name = "NFS"; // filesystems for /win Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Sat Aug 9 10:45:50 2008 @@ -1417,11 +1417,12 @@ t = LibStorage::VolumeInfo::swig_mount_by_get(vinfo); p["mountby"] = toSymbol( conv_mountby, t ); } - t = LibStorage::VolumeInfo::swig_usedBy_get(vinfo); + t = LibStorage::VolumeInfo::swig_usedByType_get(vinfo); if( t!=LibStorage::UB_NONE() ) { p["used_by_type"] = toSymbol( conv_usedby, t ); p["used_by"] = LibStorage::VolumeInfo::swig_usedByName_get(vinfo); + p["used_by_device"] = LibStorage::VolumeInfo::swig_usedByDevice_get(vinfo); } tmp = LibStorage::VolumeInfo::swig_fstab_options_get(vinfo); if( size(tmp)>0 ) @@ -1727,7 +1728,7 @@ { list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", "max_logical", "max_primary", "type", "readonly", - "used_by_type", "used_by", "partitions", "dasdfmt", + "used_by_type", "used_by", "used_by_device", "partitions", "dasdfmt", "udev_id", "udev_path" ]; foreach( string s, l, ``{ @@ -1751,11 +1752,12 @@ c["device"] = LibStorage::ContainerInfo::swig_device_get(info); integer t = LibStorage::ContainerInfo::swig_type_get(info); c["type"] = toSymbol( conv_ctype, t ); - t = LibStorage::ContainerInfo::swig_usedBy_get(info); + t = LibStorage::ContainerInfo::swig_usedByType_get(info); if( t!=LibStorage::UB_NONE() ) { c["used_by_type"] = toSymbol( conv_usedby, t ); c["used_by"] = LibStorage::ContainerInfo::swig_usedByName_get(info); + c["used_by_device"] = LibStorage::ContainerInfo::swig_usedByDevice_get(info); } boolean b = LibStorage::ContainerInfo::swig_readonly_get(info); if( b ) Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Sat Aug 9 10:45:50 2008 @@ -394,7 +394,7 @@ case `used_by: { - string value = UsedByString(data["used_by_type"]:`UB_NONE, data["used_by"]:""); + string value = UsedByString(data["used_by_type"]:`UB_NONE, data["used_by_device"]:""); if (style == `table) return value; else @@ -754,25 +754,16 @@ */ global symbol PredicateUsedByDevice(map disk, map partition, list<string> devices) { - // TODO: this should come from libstorage - string UsedByDevice(map tmp) - { - if (tmp["used_by_type"]:`UB_NONE == `UB_DM) - return "/dev/mapper/" + tmp["used_by"]:""; - else - return "/dev/" + tmp["used_by"]:""; - } - if (partition == nil) { - if (contains(devices, UsedByDevice(disk))) + if (contains(devices, disk["used_by_device"]:"")) return `showandfollow; else return `follow; } else { - if (contains(devices, UsedByDevice(partition))) + if (contains(devices, partition["used_by_device"]:"")) return `show; else return `ignore; -- 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] r49898 - /tags/stable-2_17_14/storage/
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Sat Aug 9 00:30:39 2008 New Revision: 49898 URL: http://svn.opensuse.org/viewcvs/yast?rev=49898&view=rev Log: Created tag stable-2_17_14 for storage Added: tags/stable-2_17_14/storage/ - copied from r49897, trunk/storage/ -- 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] r49897 - in /trunk/storage/libstorage/src: Container.h Storage.cc Storage.h StorageTypes.cc StorageTypes.h Volume.h
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Sat Aug 9 00:15:11 2008 New Revision: 49897 URL: http://svn.opensuse.org/viewcvs/yast?rev=49897&view=rev Log: - some cleanup Modified: trunk/storage/libstorage/src/Container.h trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageTypes.cc trunk/storage/libstorage/src/StorageTypes.h trunk/storage/libstorage/src/Volume.h 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 Sat Aug 9 00:15:11 2008 @@ -143,7 +143,7 @@ void setSilent( bool val=true ) { silent=val; } void clearUsedBy() { uby.clear(); } - void setUsedBy(storage::UsedByType t, const string& name) { uby.set(t, name); } + void setUsedBy(storage::UsedByType ub_type, const string& ub_name) { uby.set(ub_type, ub_name); } const storage::usedBy& getUsedBy() const { return uby; } storage::UsedByType getUsedByType() const { return uby.type(); } const string& usedByName() const { return uby.name(); } 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 Sat Aug 9 00:15:11 2008 @@ -4592,32 +4592,31 @@ } -bool Storage::setUsedBy( const string& dev, UsedByType typ, const string& name ) - { +bool Storage::setUsedBy(const string& dev, UsedByType ub_type, const string& ub_name) +{ bool ret=true; VolIterator v; if( !findVolume( dev, v ) ) - { + { DiskIterator i = findDisk( dev ); if( i != dEnd() ) - { - i->setUsedBy( typ, name ); - } + { + i->setUsedBy(ub_type, ub_name); + } else - { + { ret = false; - y2error( "could not set used by %d:%s for %s", typ, name.c_str(), - dev.c_str() ); - } + y2err("could not set ub_type:" << ub_type << " ub_name:" << ub_name << + "for dev: " << dev); } + } else - { - v->setUsedBy( typ, name ); - } - y2milestone( "dev:%s usedBy %d:%s ret:%d", dev.c_str(), typ, name.c_str(), - ret ); - return( ret ); + { + v->setUsedBy(ub_type, ub_name); } + y2mil("dev:" << dev << " ub_type:" << ub_type << " ub_name:" << ub_name << " ret:" << ret); + return ret; +} bool Storage::usedBy( const string& dev, storage::usedBy& ub ) @@ -4931,9 +4930,10 @@ return( ret ); } -int Storage::removeUsing( const string& device, const storage::usedBy& uby ) - { - y2mil( "device:" << device << uby ); + +int Storage::removeUsing(const string& device, const storage::usedBy& uby) +{ + y2mil("device:" << device << " uby:" << uby); string name = uby.name(); int ret=0; switch( uby.type() ) @@ -4957,9 +4957,10 @@ ret = STORAGE_REMOVE_USING_UNKNOWN_TYPE; break; } - y2milestone( "ret:%d", ret ); - return( ret ); - } + y2mil("ret:" << ret); + return ret; +} + void Storage::rootMounted() { 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 Sat Aug 9 00:15:11 2008 @@ -235,8 +235,8 @@ storage::UsedByType usedBy( const string& dev ); bool usedBy( const string& dev, storage::usedBy& ub ); bool clearUsedBy(const string& dev); - bool setUsedBy(const string& dev, storage::UsedByType typ, - const string& name ); + bool setUsedBy(const string& dev, storage::UsedByType ub_type, + const string& ub_name); bool canUseDevice( const string& dev, bool disks_allowed=false ); bool knownDevice( const string& dev, bool disks_allowed=false ); bool setDmcryptData( const string& dev, const string& dm, 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 Sat Aug 9 00:15:11 2008 @@ -55,9 +55,9 @@ usedBy::operator string() const { string st; - if( t!=storage::UB_NONE ) + if (type() != storage::UB_NONE) { - switch( t ) + switch (type()) { case storage::UB_LVM: st = "lvm"; @@ -75,7 +75,7 @@ st = "UNKNOWN"; break; } - st += "[" + nm + "]"; + st += "[" + name() + "]"; } return st; } @@ -83,7 +83,7 @@ std::ostream& operator<<(std::ostream& s, const usedBy& d) { - if( d.t!=storage::UB_NONE ) + if (d.type() != storage::UB_NONE) { s << " UsedBy:" << string(d); } 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 Sat Aug 9 00:15:11 2008 @@ -101,24 +101,28 @@ class usedBy { public: - usedBy() : t(storage::UB_NONE) {} - usedBy(storage::UsedByType typ, const string& n) : t(typ), nm(n) {} - void clear() { t=storage::UB_NONE; nm.erase(); } - void set( storage::UsedByType type, const string& n ) - { t=type; (t==storage::UB_NONE)?nm.erase():nm=n; } - bool operator==( const usedBy& rhs ) const - { return( t==rhs.t && nm==rhs.nm ); } - bool operator!=( const usedBy& rhs ) const - { return( !(*this==rhs)); } + usedBy() : ub_type(storage::UB_NONE) {} + usedBy(storage::UsedByType type, const string& name) : ub_type(type), ub_name(name) {} + + void clear() { ub_type = storage::UB_NONE; ub_name.erase(); } + void set(storage::UsedByType type, const string& name) + { ub_type = type; (ub_type==storage::UB_NONE)?ub_name.erase():ub_name = name; } + + bool operator==(const usedBy& rhs) const + { return ub_type == rhs.ub_type && ub_name == rhs.ub_name; } + bool operator!=(const usedBy& rhs) const + { return !(*this == rhs); } + operator string() const; - storage::UsedByType type() const { return t; } - const string& name() const { return nm; } + storage::UsedByType type() const { return ub_type; } + const string& name() const { return ub_name; } + friend std::ostream& operator<< (std::ostream&, const usedBy&); private: - storage::UsedByType t; - string nm; + storage::UsedByType ub_type; + string ub_name; }; 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 Sat Aug 9 00:15:11 2008 @@ -53,7 +53,7 @@ bool fstabAdded() const { return( fstab_added ); } void clearUsedBy() { uby.clear(); } - void setUsedBy(storage::UsedByType t, const string& name) { uby.set(t, name); } + void setUsedBy(storage::UsedByType ub_type, const string& ub_name) { uby.set(ub_type, ub_name); } const storage::usedBy& getUsedBy() const { return uby; } storage::UsedByType getUsedByType() const { return uby.type(); } const string& usedByName() const { return uby.name(); } -- 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] r49896 - in /trunk/storage/libstorage/src: StorageTypes.cc StorageTypes.h Volume.cc
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 22:57:28 2008 New Revision: 49896 URL: http://svn.opensuse.org/viewcvs/yast?rev=49896&view=rev Log: - protect members of class usedBy Modified: trunk/storage/libstorage/src/StorageTypes.cc trunk/storage/libstorage/src/StorageTypes.h trunk/storage/libstorage/src/Volume.cc 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 Fri Aug 8 22:57:28 2008 @@ -13,7 +13,7 @@ { if( vol()==NULL || rhs.vol()==NULL ) return( false ); - else + else { if( rhs.vol()->getMount()=="swap" ) return( false ); @@ -51,5 +51,44 @@ return( unsigned(l)<unsigned(r) ); } -} + usedBy::operator string() const + { + string st; + if( t!=storage::UB_NONE ) + { + switch( t ) + { + case storage::UB_LVM: + st = "lvm"; + break; + case storage::UB_MD: + st = "md"; + break; + case storage::UB_DM: + st = "dm"; + break; + case storage::UB_DMRAID: + st = "dmraid"; + break; + default: + st = "UNKNOWN"; + break; + } + st += "[" + nm + "]"; + } + return st; + } + + + std::ostream& operator<<(std::ostream& s, const usedBy& d) + { + if( d.t!=storage::UB_NONE ) + { + s << " UsedBy:" << string(d); + } + return s; + } + + +} 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 Fri Aug 8 22:57:28 2008 @@ -97,10 +97,12 @@ { return( !(*this < rhs && *this == rhs) ); } }; -struct usedBy - { - usedBy() : t(storage::UB_NONE) {;} - usedBy( storage::UsedByType typ, const string& n ) : t(typ), nm(n) {;} + +class usedBy +{ +public: + usedBy() : t(storage::UB_NONE) {} + usedBy(storage::UsedByType typ, const string& n) : t(typ), nm(n) {} void clear() { t=storage::UB_NONE; nm.erase(); } void set( storage::UsedByType type, const string& n ) { t=type; (t==storage::UB_NONE)?nm.erase():nm=n; } @@ -108,52 +110,17 @@ { return( t==rhs.t && nm==rhs.nm ); } bool operator!=( const usedBy& rhs ) const { return( !(*this==rhs)); } - inline operator string() const; + operator string() const; - storage::UsedByType type() const { return( t ); } - const string& name() const { return( nm ); } - friend inline std::ostream& operator<< (std::ostream&, const usedBy& ); + storage::UsedByType type() const { return t; } + const string& name() const { return nm; } + friend std::ostream& operator<< (std::ostream&, const usedBy&); +private: storage::UsedByType t; string nm; - }; +}; -inline usedBy::operator string() const - { - string st; - if( t!=storage::UB_NONE ) - { - switch( t ) - { - case storage::UB_LVM: - st = "lvm"; - break; - case storage::UB_MD: - st = "md"; - break; - case storage::UB_DM: - st = "dm"; - break; - case storage::UB_DMRAID: - st = "dmraid"; - break; - default: - st = "UNKNOWN"; - break; - } - st += "[" + nm + "]"; - } - return( st ); - } - -inline std::ostream& operator<< (std::ostream& s, const usedBy& d ) - { - if( d.t!=storage::UB_NONE ) - { - s << " UsedBy:" << string(d); - } - return( s ); - } struct match_string { 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 Fri Aug 8 22:57:28 2008 @@ -487,7 +487,7 @@ else { FsCapabilities caps; - if( uby.t != UB_NONE ) + if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -528,7 +528,7 @@ { ret = VOLUME_MOUNT_POINT_INVALID; } - else if( uby.t != UB_NONE ) + else if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -554,7 +554,7 @@ int ret = 0; y2milestone( "device:%s mby:%s", dev.c_str(), mbyTypeString(mby).c_str() ); y2mil( "vorher:" << *this ); - if( uby.t != UB_NONE ) + if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -598,7 +598,7 @@ int ret = 0; y2milestone( "device:%s options:%s encr:%s", dev.c_str(), options.c_str(), encTypeString(encryption).c_str() ); - if( uby.t != UB_NONE ) + if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -670,7 +670,7 @@ { cont->getStorage()->showInfoCb( formatText(true) ); } - if( uby.t != UB_NONE ) + if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -1131,7 +1131,7 @@ { createPath( lmount ); } - if( ret==0 && !mp.empty() && uby.t != UB_NONE ) + if( ret==0 && !mp.empty() && uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } @@ -1166,7 +1166,7 @@ { int ret=0; y2milestone( "val:%llu", newSizeK ); - if( uby.t != UB_NONE ) + if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; } -- 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] r49895 - in /trunk/storage/storage/src: include/ep-dm.ycp modules/StorageFields.ycp
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 22:11:19 2008 New Revision: 49895 URL: http://svn.opensuse.org/viewcvs/yast?rev=49895&view=rev Log: - fixed PredicateUsedByDevice Modified: trunk/storage/storage/src/include/ep-dm.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dm.ycp (original) +++ trunk/storage/storage/src/include/ep-dm.ycp Fri Aug 8 22:11:19 2008 @@ -95,8 +95,7 @@ symbol Predicate(map disk, map partition) { - // TODO: this is sick - return StorageFields::PredicateUsedByDevice(disk, partition, [ "/dev/" + substring(part_device, 12) ]); + return StorageFields::PredicateUsedByDevice(disk, partition, [ part_device ]); } list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Fri Aug 8 22:11:19 2008 @@ -754,16 +754,25 @@ */ global symbol PredicateUsedByDevice(map disk, map partition, list<string> devices) { + // TODO: this should come from libstorage + string UsedByDevice(map tmp) + { + if (tmp["used_by_type"]:`UB_NONE == `UB_DM) + return "/dev/mapper/" + tmp["used_by"]:""; + else + return "/dev/" + tmp["used_by"]:""; + } + if (partition == nil) { - if (contains(devices, "/dev/" + disk["used_by"]:"")) + if (contains(devices, UsedByDevice(disk))) return `showandfollow; else return `follow; } else { - if (contains(devices, "/dev/" + partition["used_by"]:"")) + if (contains(devices, UsedByDevice(partition))) return `show; else return `ignore; -- 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] r49894 - in /trunk/storage: VERSION package/yast2-storage.changes storage/src/include/ep-dm.ycp
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 21:59:18 2008 New Revision: 49894 URL: http://svn.opensuse.org/viewcvs/yast?rev=49894&view=rev Log: - added tab with used devices for device mapper devices Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dm.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49894&r1=498… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Aug 8 21:59:18 2008 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Aug 8 21:59:18 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 08 21:56:00 CEST 2008 - aschnell(a)suse.de + +- added tab with used devices for device mapper devices +- version 2.17.14 + +------------------------------------------------------------------- Fri Aug 08 15:01:11 CEST 2008 - aschnell(a)suse.de - integrated redesigned expert partitioner into installation Modified: trunk/storage/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dm.ycp (original) +++ trunk/storage/storage/src/include/ep-dm.ycp Fri Aug 8 21:59:18 2008 @@ -44,7 +44,7 @@ } - void CreateDmPanel(any user_data) + void CreateDmOverviewTab(any user_data) { string dm_device = (string) user_data; @@ -54,7 +54,7 @@ `heading_filesystem, `fs_type, `mount_point, `mount_by, `uuid, `label ]); - UI::ReplaceWidget(`tree_panel, + UI::ReplaceWidget(`tab_panel, Greasemonkey::Transform( `VBox( `IconAndHeading(sformat(_("DM Device: %1"), dm_device), dm_icon), @@ -74,7 +74,7 @@ } - void HandleDmPanel(any user_data, symbol widget) + void HandleDmOverviewTab(any user_data, symbol widget) { string dm_device = (string) user_data; @@ -85,4 +85,68 @@ break; } } + + + void CreateDmDevicesTab(any user_data) + { + string part_device = (string) user_data; + + Debug("part_device", substring(part_device, 5)); + + symbol Predicate(map disk, map partition) + { + // TODO: this is sick + return StorageFields::PredicateUsedByDevice(disk, partition, [ "/dev/" + substring(part_device, 12) ]); + } + + list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, + `format, `type, `used_by ]); + + map<string, map> target_map = Storage::GetTargetMap(); + + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); + + UI::ReplaceWidget(`tab_panel, + `VBox( + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents) + ) + ); + + string helptext = _("DM TODO"); + + Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); + } + + + void CreateDmPanel(any user_data) + { + string device = (string) user_data; + + map<symbol, map> data = $[ `overview : $[ `create : CreateDmOverviewTab, `handle : HandleDmOverviewTab, `user_data : user_data ], + `devices : $[ `create : CreateDmDevicesTab, `user_data : user_data ] ]; + + UI::ReplaceWidget(`tree_panel, + Greasemonkey::Transform( + `VBox( + `IconAndHeading(sformat(_("Dm Device: %1"), device), dm_icon), + `DumbTab(`id(`tab), [ + `item(`id(`overview), _("&Overview")), + `item(`id(`devices), _("&Used Devices")) + ], + `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) + ) + ) + ) + ); + + TabPanel::Init(data); + } + + + void HandleDmPanel(any user_data, symbol widget) + { + TabPanel::Handle(widget); + } } -- 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] r49893 - /trunk/storage/storage/src/include/ep-raid.ycp
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 21:56:33 2008 New Revision: 49893 URL: http://svn.opensuse.org/viewcvs/yast?rev=49893&view=rev Log: - renamed variable Modified: trunk/storage/storage/src/include/ep-raid.ycp Modified: trunk/storage/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid.ycp (original) +++ trunk/storage/storage/src/include/ep-raid.ycp Fri Aug 8 21:56:33 2008 @@ -63,7 +63,7 @@ { string part_device = (string) user_data; - map<string, map> tg = Storage::GetTargetMap(); + map<string, map> target_map = Storage::GetTargetMap(); list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `used_by, `heading_md, `raid_type, `chunk_size, @@ -74,7 +74,7 @@ UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - StorageFields::Overview(fields, tg, part_device), + StorageFields::Overview(fields, target_map, part_device), `HBox( `PushButton(`id(`edit), _("Edit...")), `PushButton(`id(`resize), _("Resize...")), -- 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] r49892 - in /trunk/storage/libstorage/src: Container.h DmCo.cc MdCo.cc PeContainer.cc Storage.cc Storage.h Volume.h
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 21:01:19 2008 New Revision: 49892 URL: http://svn.opensuse.org/viewcvs/yast?rev=49892&view=rev Log: - added clearUsedBy functions Modified: trunk/storage/libstorage/src/Container.h trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/PeContainer.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/Volume.h 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 Fri Aug 8 21:01:19 2008 @@ -141,10 +141,13 @@ void setDeleted( bool val=true ) { del=val; } void setCreated( bool val=true ) { create=val; } void setSilent( bool val=true ) { silent=val; } - void setUsedBy( storage::UsedByType t, const string& name ) { uby.set( t, name ); } - const storage::usedBy& getUsedBy() const { return( uby ); } - storage::UsedByType getUsedByType() const { return( uby.type() ); } - const string& usedByName() const { return( uby.name() ); } + + void clearUsedBy() { uby.clear(); } + void setUsedBy(storage::UsedByType t, const string& name) { uby.set(t, name); } + const storage::usedBy& getUsedBy() const { return uby; } + storage::UsedByType getUsedByType() const { return uby.type(); } + const string& usedByName() const { return uby.name(); } + bool readonly() const { return ronly; } unsigned long minorNr() const { return mnr; } unsigned long majorNr() const { return mjr; } 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 Fri Aug 8 21:01:19 2008 @@ -185,7 +185,7 @@ skip = true; getStorage()->setDmcryptData( it->first, m->device(), min_num, m->sizeK(), detectEncryption (m->device()) ); - getStorage()->setUsedBy( it->first, UB_NONE, "" ); + getStorage()->clearUsedBy(it->first); } if( !skip && m->sizeK()>0 ) addDm( m ); @@ -273,7 +273,7 @@ for( map<string,unsigned long>::const_iterator it = pe.begin(); it!=pe.end(); ++it ) { - getStorage()->setUsedBy( it->first, UB_NONE, "" ); + getStorage()->clearUsedBy(it->first); } i->setDeleted( true ); } 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 Fri Aug 8 21:01:19 2008 @@ -400,7 +400,7 @@ if( ret==0 ) { string d = normalizeDevice( dev ); - getStorage()->setUsedBy( d, UB_NONE, "" ); + getStorage()->clearUsedBy(d); } y2milestone( "ret:%d", ret ); return( ret ); @@ -533,7 +533,7 @@ list<string> devs; i->getDevs( devs ); for( list<string>::const_iterator s=devs.begin(); s!=devs.end(); ++s ) - getStorage()->setUsedBy( *s, UB_NONE, "" ); + getStorage()->clearUsedBy(*s); if( i->created() ) { if( !removeFromList( &(*i) )) 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 Fri Aug 8 21:01:19 2008 @@ -28,9 +28,9 @@ void PeContainer::unuseDev() { for( list<Pv>::const_iterator s=pv.begin(); s!=pv.end(); ++s ) - getStorage()->setUsedBy( s->device, UB_NONE, "" ); + getStorage()->clearUsedBy(s->device); for( list<Pv>::const_iterator s=pv_add.begin(); s!=pv_add.end(); ++s ) - getStorage()->setUsedBy( s->device, UB_NONE, "" ); + getStorage()->clearUsedBy(s->device); } int @@ -157,7 +157,7 @@ } if( ret==0 ) { - getStorage()->setUsedBy( dev, UB_NONE, "" ); + getStorage()->clearUsedBy(dev); removed_pe += cur_pv.num_pe; if( !added_pv ) plrem.push_back( cur_pv ); 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 Fri Aug 8 21:01:19 2008 @@ -4585,6 +4585,13 @@ return( ret ); } + +bool Storage::clearUsedBy(const string& dev) +{ + return setUsedBy(dev, UB_NONE, ""); +} + + bool Storage::setUsedBy( const string& dev, UsedByType typ, const string& name ) { bool ret=true; @@ -4612,6 +4619,7 @@ return( ret ); } + bool Storage::usedBy( const string& dev, storage::usedBy& ub ) { ub.clear(); 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 Fri Aug 8 21:01:19 2008 @@ -234,8 +234,9 @@ void logProcData( const string& l="" ); storage::UsedByType usedBy( const string& dev ); bool usedBy( const string& dev, storage::usedBy& ub ); - bool setUsedBy( const string& dev, storage::UsedByType typ, - const string& name ); + bool clearUsedBy(const string& dev); + bool setUsedBy(const string& dev, storage::UsedByType typ, + const string& name ); bool canUseDevice( const string& dev, bool disks_allowed=false ); bool knownDevice( const string& dev, bool disks_allowed=false ); bool setDmcryptData( const string& dev, const string& dm, 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 Fri Aug 8 21:01:19 2008 @@ -51,10 +51,13 @@ void setFstabAdded( bool val=true ) { fstab_added=val; } bool sameDevice( const string& device ) const; bool fstabAdded() const { return( fstab_added ); } - const storage::usedBy& getUsedBy() const{ return( uby ); } - storage::UsedByType getUsedByType() const { return( uby.type() ); } - const string& usedByName() const { return( uby.name() ); } - void setUsedBy( storage::UsedByType t, const string& name ) { uby.set( t, name );} + + void clearUsedBy() { uby.clear(); } + void setUsedBy(storage::UsedByType t, const string& name) { uby.set(t, name); } + const storage::usedBy& getUsedBy() const { return uby; } + storage::UsedByType getUsedByType() const { return uby.type(); } + const string& usedByName() const { return uby.name(); } + void getFsInfo( const Volume* source ); virtual int setFormat( bool format=true, storage::FsType fs=storage::REISERFS ); -- 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] r49891 - /trunk/storage/libstorage/src/Volume.cc
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 18:39:34 2008 New Revision: 49891 URL: http://svn.opensuse.org/viewcvs/yast?rev=49891&view=rev Log: - shell quoting Modified: trunk/storage/libstorage/src/Volume.cc 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 Fri Aug 8 18:39:34 2008 @@ -1497,15 +1497,15 @@ { cmd += " --key-file /dev/urandom create"; cmd += ' '; - cmd += table; + cmd += quote(table); cmd += ' '; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); } else { cmd += " luksFormat"; cmd += ' '; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); cmd += ' '; cmd += pwdf; } -- 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] r49890 - /tags/stable-2_17_13/storage/
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 17:38:47 2008 New Revision: 49890 URL: http://svn.opensuse.org/viewcvs/yast?rev=49890&view=rev Log: Created tag stable-2_17_13 for storage Added: tags/stable-2_17_13/storage/ - copied from r49889, trunk/storage/ -- 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] r49889 - in /trunk/ldap-server: VERSION package/yast2-ldap-server.changes yast2-ldap-server.spec.in
by rhafer＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: rhafer Date: Fri Aug 8 17:24:09 2008 New Revision: 49889 URL: http://svn.opensuse.org/viewcvs/yast?rev=49889&view=rev Log: Version 2.17.0 Modified: trunk/ldap-server/VERSION trunk/ldap-server/package/yast2-ldap-server.changes trunk/ldap-server/yast2-ldap-server.spec.in Modified: trunk/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/VERSION?rev=49889&r1… ============================================================================== --- trunk/ldap-server/VERSION (original) +++ trunk/ldap-server/VERSION Fri Aug 8 17:24:09 2008 @@ -1 +1 @@ -2.16.3 +2.17.0 Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Fri Aug 8 17:24:09 2008 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Aug 8 12:50:21 CEST 2008 - rhafer(a)suse.de + +- Version 2.17.0 +- Major rewrite of the whole module. yast2-ldap-server is using + OpenLDAP's configuration database (back-config) now instead of + /etc/openldap/slapd.conf +- The module can handle /etc/sysconfig/openldap settings now. + (Fate#303058) +- Automatically setup TLS if certificates exist (Fate#303165) +- CA-Management Module can be launched from within + yast2-ldap-server (Fate#303546) + +------------------------------------------------------------------- Fri May 16 16:49:30 CEST 2008 - rhafer(a)suse.de - Error out if Database does not exist in Modified: trunk/ldap-server/yast2-ldap-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/yast2-ldap-server.sp… ============================================================================== --- trunk/ldap-server/yast2-ldap-server.spec.in (original) +++ trunk/ldap-server/yast2-ldap-server.spec.in Fri Aug 8 17:24:09 2008 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools libldapcpp-devel boost-devel gcc-c++ -Requires: acl yast2 yast2-users yast2-ldap-client yast2-network perl perl-gettext yast2-perl-bindings yast2-ca-management perl-X500-DN perl-Digest-SHA1 net-tools +BuildRequires: boost-devel gcc-c++ libldapcpp-devel perl-Digest-SHA1 perl-gettext perl-X500-DN pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools +Requires: acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-network yast2-perl-bindings yast2-users Summary: Configuration of the OpenLDAP server @@ -34,6 +34,7 @@ @clientdir@/ldap-server.ycp @clientdir@/ldap-server_*.ycp @moduledir@/LdapServer.* +@moduledir@/LdapDatabase.* @moduledir@/YaPI/LdapServer.pm @desktopdir@/ldap-server.desktop @plugindir@/libpy2ag_slapdconfig.* -- 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] r49888 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: rhafer Date: Fri Aug 8 17:24:05 2008 New Revision: 49888 URL: http://svn.opensuse.org/viewcvs/yast?rev=49888&view=rev Log: Write ldaps setting during initial setup Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Aug 8 17:24:05 2008 @@ -466,6 +466,14 @@ Progress->Finish(); return 0; } + if ( $use_ldaps_listener ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'yes'); + } + else + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'no'); + } $rc = Service->Restart("ldap"); if (! $rc ) { -- 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] r49887 - in /trunk/ldap-server/src: LdapDatabase.ycp LdapServer.pm dialogs.ycp
by rhafer＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: rhafer Date: Fri Aug 8 17:24:02 2008 New Revision: 49887 URL: http://svn.opensuse.org/viewcvs/yast?rev=49887&view=rev Log: re-use the LdapDatabase-Widgets in Proposal Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/dialogs.ycp Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp… ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Fri Aug 8 17:24:02 2008 @@ -10,15 +10,20 @@ module "Database"; - map <string, string> baseDb = $[]; + map <string, any> baseDb = $[]; boolean createDbDir = false; - define symbol AddDbBasic() + global define symbol AddDbBasic( boolean createDefaults ) { boolean user_changed_dbdir = false; - list dblist = LdapServer::ReadDatabaseList(); - integer numDbs = size(dblist)-2; // don't count frontend and Config DB + map <string, any> db = $[]; + integer numDbs = 0; + if ( ! createDefaults ) + { + list dblist = LdapServer::ReadDatabaseList(); + numDbs = size(dblist)-2; // don't count frontend and Config DB + } string caption = _("New Database"); string enctype = "SSHA"; list enc_types = [ @@ -81,6 +86,28 @@ ); Wizard::SetContentsButtons(caption, addDbWidget, "", Label::BackButton(), Label::NextButton()); + if ( createDefaults ) + { + db = LdapServer::CreateInitialDefaults(); + boolean append_checked = true; + + if( db["rootdn"]:"" != "" ) + { + integer pos = search( db["rootdn"]:"", db["suffix"]:"" ); + if( pos > -1 ) + { + db["rootdn"] = substring( db["rootdn"]:"", 0, pos-1 ); + } else + { + append_checked = false; + } + } + UI::ChangeWidget(`id( `te_basedn), `Value, db["suffix"]:"" ); + UI::ChangeWidget(`id( `te_rootdn), `Value, db["rootdn"]:"" ); + UI::ChangeWidget(`id( `cb_append_basedn), `Value, append_checked ); + UI::ChangeWidget(`id( `te_directory), `Value, db["directory"]:"" ); + UI::ChangeWidget(`id( `cb_cryptmethod), `Value, db["pwenctype"]:"" ); + } symbol ret = `next; while(true) { ret = (symbol)UI::UserInput(); @@ -129,19 +156,22 @@ continue; } - list<map<string, string> > dblist = LdapServer::ReadDatabaseList(); - boolean exists = false; - foreach(map<string, string> db, dblist, { - if ( suffix == db["suffix"]:"" ) + if ( ! createDefaults ) + { + list<map<string, string> > dblist = LdapServer::ReadDatabaseList(); + boolean exists = false; + foreach(map<string, string> db, dblist, { + if ( suffix == db["suffix"]:"" ) + { + Popup::Error( _("A database with that Base DN already exists.") ); + exists = true; + break; + } + } ); + if ( exists ) { - Popup::Error( _("A database with that Base DN already exists.") ); - exists = true; - break; + continue; } - } ); - if ( exists ) - { - continue; } if( rootpw != "" && rootdn == "" ) { @@ -169,12 +199,11 @@ createDbDir = true; } } - //create new database - map<string,string> db = $[ - "suffix" : suffix, - "directory" : directory, - "type" : "hdb", - ]; + + db = add( db, "suffix", suffix ); + db = add( db, "directory", directory ); + db = add( db, "type", "hdb" ); + if( rootdn != "" && (boolean)UI::QueryWidget( `cb_append_basedn, `Value ) ) { rootdn = rootdn+","+suffix; @@ -245,7 +274,7 @@ global define any AddDbWizard() { map aliases = $[ - "basics" : ``( AddDbBasic() ), + "basics" : ``( AddDbBasic(false) ), "syncprov" : ``( DbSyncProv() ), "ppolicy" : ``( DbPpolicy() ) ]; @@ -273,7 +302,7 @@ return ret; } - global define map<string,string> GetDatabase() + global define map<string,any> GetDatabase() { return baseDb; } Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Aug 8 17:24:02 2008 @@ -586,7 +586,7 @@ .''._("Start LDAP Server: ").'<code>'.($defaults->{'serviceEnabled'}->value?_("Yes"):_("No")).'</code>' .''._("Register at SLP Service: ").'<code>'.($defaults->{'slpRegister'}->value?_("Yes"):_("No")).'</code>' .'<h2>'._("Create initial Database with the following Parameters").'</h2>' - .''._("Database Suffix: ").'<code>'.$defaults->{'basedn'}.'</code>' + .''._("Database Suffix: ").'<code>'.$defaults->{'suffix'}.'</code>' .''._("Administrator DN: ").'<code>'.$defaults->{'rootdn'}.'</code>'; return $string; @@ -935,8 +935,9 @@ push @rdn, "dc=".$rdn; } my $basedn = join ',', @rdn ; - y2milestone("basedn: $basedn"); - $dbDefaults{'basedn'} = $basedn; + y2milestone("suffix: $basedn"); + $dbDefaults{'suffix'} = $basedn; + $dbDefaults{'directory'} = "/var/lib/ldap"; $dbDefaults{'rootdn'} = "cn=admin,".$basedn; $dbDefaults{'rootpw'} = ""; $dbDefaults{'rootpw_clear'} = ""; @@ -980,7 +981,7 @@ my $pwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'rootpw_clear'} ); my $database = { 'type' => 'hdb', - 'suffix' => $dbDefaults{'basedn'}, + 'suffix' => $dbDefaults{'suffix'}, 'rootdn' => $dbDefaults{'rootdn'}, 'rootpw' => $pwHash, 'directory' => '/var/lib/ldap', @@ -1038,7 +1039,7 @@ $self->ChangeDatabaseIndex(1, $idx ); } } - push @added_databases, { suffix => $dbDefaults{'basedn'}, + push @added_databases, { suffix => $dbDefaults{'suffix'}, rootdn => $dbDefaults{'rootdn'}, rootpw => $dbDefaults{'rootpw_clear'} }; $usingDefaults = 0; @@ -1202,7 +1203,7 @@ } -BEGIN { $TYPEINFO {AddDatabase} = ["function", "boolean", "integer", [ "map" , "string", "string"], "boolean" ]; } +BEGIN { $TYPEINFO {AddDatabase} = ["function", "boolean", "integer", [ "map" , "string", "any"], "boolean" ]; } sub AddDatabase { my ($self, $index, $db, $createDir) = @_; @@ -1236,6 +1237,8 @@ $self->SetError( $err->{'summary'}, $err->{'description'} ); return 0; } + + # add some default ACLs my @acls = ('to dn.subtree="'. $db->{'suffix'} .'" attrs=userPassword by self write by * auth', # 'to attrs=shadowLastChange by self write by * read', 'to dn.subtree="'. $db->{'suffix'} .'" by * read'); @@ -1249,6 +1252,21 @@ return 0; } } + + # add some defaults to DB_CONFIG + my $dbconfig = [ + "set_cachesize 0 15000000 1", + "set_lg_regionmax 262144", + "set_lg_bsize 2097152", + "set_flags DB_LOG_AUTOREMOVE" + ]; + $rc = SCR->Write(".ldapserver.database.{$index}.dbconfig", $dbconfig ); + if(! $rc ) { + my $err = SCR->Error(".ldapserver"); + y2error("Adding DB_CONFIG failed: ".$err->{'summary'}." ".$err->{'description'}); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return 0; + } return 1; } Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Fri Aug 8 17:24:02 2008 @@ -298,157 +298,12 @@ any ProposalDialog() { - map <string, any> defaults = LdapServer::CreateInitialDefaults(); - string enctype = ""; - boolean useCommonCA = false; - boolean common_ca_available = ( CaMgm::prop_selection == `def || CaMgm::prop_selection == `floppy || CaMgm::prop_selection == `expert ); - - if( !common_ca_available ) + symbol ret = LdapDatabase::AddDbBasic(true); + if ( ret == `next ) { - useCommonCA = false; + LdapServer::SetInitialDefaults(LdapDatabase::GetDatabase()); } - boolean append_checked = true; - - if( defaults["rootdn"]:"" != "" ) - { - integer pos = search( defaults["rootdn"]:"", defaults["basedn"]:"" ); - if( pos > -1 ) - { - defaults["rootdn"] = substring( defaults["rootdn"]:"", 0, pos-1 ); - } else - { - append_checked = false; - } - } - - list enc_types = [ - `item( `id( "CRYPT"), "CRYPT", enctype == "CRYPT" ), - `item( `id( "SMD5" ), "SMD5", enctype == "SMD5" ), - `item( `id( "SHA" ), "SHA", enctype == "SHA" ), - `item( `id( "SSHA" ), "SSHA", enctype == "SSHA" ), - `item( `id( "PLAIN" ), "PLAIN", enctype == "PLAIN" ) - ]; - - term dlg_propose = - `VBox( - `Heading( _("Database Settings") ), - `HSquash( - `VBox ( - `Left( - `InputField(`id( `te_basedn), `opt(`hstretch) , _("&Base DN"), defaults["basedn"]:"" ) - ), - `VSpacing(0.5), - `Left( - `VSquash( - `HBox( - `InputField( `id( `te_rootdn ), _("&Administrator DN"), defaults["rootdn"]:"" ), - `HSpacing(), - `VBox( - `Bottom( - `CheckBox( `id( `cb_append_basedn ), _("A&ppend Base DN"), append_checked ) - ), - `VSpacing( 0.3 ) - ) - ) - ) - ), - `VSpacing(0.5), - `Left( - `Password( `id( `te_rootpw ), `opt(`hstretch), _("LDAP Administrator &Password"), defaults["rootpw"]:"" ) - ), - `Left( - `Password( `id( `te_valid_rootpw ), `opt(`hstretch), _("&Validate Password"), defaults["rootpw"]:"" ) - ), - `Left( - `ComboBox( `id( `cmb_cryptmethod ), _("Password &Encryption"), enc_types ) - ) - ) - ) - ); - - Wizard::SetContentsButtons( caption, dlg_propose, HELPS["propose"]:"no proposal help text", - Label::BackButton(), Label::NextButton() ); - - if ( ! (boolean)defaults["serviceEnabled"]:false ) - { - UI::ChangeWidget( `id( `te_basedn ), `Enabled, false ); - UI::ChangeWidget( `id( `te_rootdn ), `Enabled, false ); - UI::ChangeWidget( `id( `cb_append_basedn ), `Enabled, false ); - UI::ChangeWidget( `id( `te_rootpw ), `Enabled, false ); - UI::ChangeWidget( `id( `te_valid_rootpw ), `Enabled, false ); - UI::ChangeWidget( `id( `cmb_cryptmethod ), `Enabled, false ); - } - - any ret = nil; - map event = $[]; - while( true ) - { - event = UI::WaitForEvent (); - ret = event["ID"]:nil; - y2milestone( "ProposeDialog: seeing return value %1", ret ); - if( ret == `back || ret == `abort || ret == `cancel ) - { - break; - } - else if( ret == `next ) - { - //validate/update rootpw - defaults["rootpw_clear"] = (string)UI::QueryWidget( `id( `te_rootpw ), `Value ); - if ( defaults["rootpw_clear"]:"" == "" ) - { - Popup::Error( _("Please enter a password for the Administrator user") ); - continue; - } - if( defaults["rootpw_clear"]:"" != "" ) - { - if( defaults["rootpw_clear"]:"" != UI::QueryWidget( `id( `te_valid_rootpw ), `Value ) ) - { - /* error popup */ - Popup::Error( _("Password validation failed.") ); - defaults["rootpw_clear"] = ""; - continue; - } - } - //update enctype - string enctype = (string)UI::QueryWidget( `id( `cmb_cryptmethod ), `Value ); - y2debug( "changing enctype to %1", enctype ); - defaults["pwenctype"] = enctype; - - //update Base DN - defaults["basedn"] = (string)UI::QueryWidget( `id( `te_basedn ), `Value ); - y2debug( "changing baseDN to %1", defaults["basedn"]:"" ); - - //update rootDN - defaults["rootdn"] = (string)UI::QueryWidget( `id( `te_rootdn ), `Value ); - if( (boolean)UI::QueryWidget( `id( `cb_append_basedn ), `Value ) ) - { - defaults["rootdn"] = defaults["rootdn"]:"" + "," + defaults["basedn"]:""; - } - LdapServer::SetInitialDefaults(defaults); - break; - } else if( ret == `rb_enable ) - { - y2debug( "enable server clicked" ); - //enable widgets - UI::ChangeWidget( `id( `te_basedn ), `Enabled, true ); - UI::ChangeWidget( `id( `te_rootdn ), `Enabled, true ); - UI::ChangeWidget( `id( `cb_append_basedn ), `Enabled, true ); - UI::ChangeWidget( `id( `te_rootpw ), `Enabled, true ); - UI::ChangeWidget( `id( `te_valid_rootpw ), `Enabled, true ); - UI::ChangeWidget( `id( `cmb_cryptmethod ), `Enabled, true ); - } else if ( ret == `rb_disable ) - { - y2debug( "disable server clicked" ); - //disable widgets - UI::ChangeWidget( `id( `te_basedn ), `Enabled, false ); - UI::ChangeWidget( `id( `te_rootdn ), `Enabled, false ); - UI::ChangeWidget( `id( `cb_append_basedn ), `Enabled, false ); - UI::ChangeWidget( `id( `te_rootpw ), `Enabled, false ); - UI::ChangeWidget( `id( `te_valid_rootpw ), `Enabled, false ); - UI::ChangeWidget( `id( `cmb_cryptmethod ), `Enabled, false ); - } - } return ret; } -- 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] r49886 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: rhafer Date: Fri Aug 8 17:23:58 2008 New Revision: 49886 URL: http://svn.opensuse.org/viewcvs/yast?rev=49886&view=rev Log: Cleanup Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 8 17:23:58 2008 @@ -537,16 +537,6 @@ { y2milestone( "Database creating aborted" ); } -// if( LdapServer::AddDatabase( db ) ) -// { -// y2milestone( "adding database was successful, now trying to add widget tree item" ); -// rebuild_widget_tree = true; -// break; -// } else { -// y2milestone( "adding database was not successful" ); -// } -// } -// } } return true; -- 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] r49885 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc widgets.ycp
by rhafer＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: rhafer Date: Fri Aug 8 17:23:55 2008 New Revision: 49885 URL: http://svn.opensuse.org/viewcvs/yast?rev=49885&view=rev Log: Hide "monitoring" and "read-only" Checkbox until they are backed by real code Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Aug 8 17:23:55 2008 @@ -1049,6 +1049,17 @@ (*i)->addAccessControl(arg->asString()->value_cstr()); ret = true; } + else if ( dbComponent == "dbconfig" ) + { + YCPList argList = arg->asList(); + StringList dbConfList; + for ( int j = 0; j < argList->size(); j++ ) + { + dbConfList.add( argList->value(j)->asString()->value_cstr() ); + } + (*i)->setStringValues("olcDbConfig", dbConfList ); + ret = true; + } else { lastError->add(YCPString("summary"), YCPString("Write Failed") ); Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Aug 8 17:23:55 2008 @@ -224,13 +224,13 @@ `VSpacing( 0.5 ), `Left( `PushButton( `id( `pb_changepw ), _("Change Password") ) - ), - `VSpacing( 0.5 ), - `Left( - `CheckBox( `id( `cb_dbreadonly ), _("Database is read-only"), false ) - ), - `Left( - `CheckBox( `id( `cb_dbmonitoring ), _("Enable Monitoring"), false ) +// ), +// `VSpacing( 0.5 ), +// `Left( +// `CheckBox( `id( `cb_dbreadonly ), _("Database is read-only"), false ) +// ), +// `Left( +// `CheckBox( `id( `cb_dbmonitoring ), _("Enable Monitoring"), false ) ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49884 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: rhafer Date: Fri Aug 8 17:23:51 2008 New Revision: 49884 URL: http://svn.opensuse.org/viewcvs/yast?rev=49884&view=rev Log: Fixed previous commit Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 8 17:23:51 2008 @@ -526,7 +526,7 @@ if (ret == `next ) { rebuild_widget_tree = true; - if ( ! LdapServer::AddDatabase(0, LdapDatabase::ReadDatabase(), LdapDatabase::GetCreateDir() ) ) + if ( ! LdapServer::AddDatabase(0, LdapDatabase::GetDatabase(), LdapDatabase::GetCreateDir() ) ) { map<string, string> err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; -- 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] r49883 - in /trunk/ldap-server/src: LdapDatabase.ycp LdapServer.pm complex.ycp dialogs.ycp ldap-server_proposal.ycp tree_structure.ycp
by rhafer＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: rhafer Date: Fri Aug 8 17:23:48 2008 New Revision: 49883 URL: http://svn.opensuse.org/viewcvs/yast?rev=49883&view=rev Log: make interface more consistant with other YaST Modules Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/complex.ycp trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/ldap-server_proposal.ycp trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp… ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Fri Aug 8 17:23:48 2008 @@ -17,7 +17,7 @@ define symbol AddDbBasic() { boolean user_changed_dbdir = false; - list dblist = LdapServer::GetDatabaseList(); + list dblist = LdapServer::ReadDatabaseList(); integer numDbs = size(dblist)-2; // don't count frontend and Config DB string caption = _("New Database"); string enctype = "SSHA"; @@ -129,7 +129,7 @@ continue; } - list<map<string, string> > dblist = LdapServer::GetDatabaseList(); + list<map<string, string> > dblist = LdapServer::ReadDatabaseList(); boolean exists = false; foreach(map<string, string> db, dblist, { if ( suffix == db["suffix"]:"" ) Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Aug 8 17:23:48 2008 @@ -579,7 +579,7 @@ sub Summary { # Configuration summary text for autoyast my $self = shift; - my $defaults = $self->GetInitialDefaults(); + my $defaults = $self->CreateInitialDefaults(); my $string; $string .= '<h2>'._("Startup Configuration").'</h2>' @@ -654,8 +654,8 @@ return $serviceEnabled; } -BEGIN { $TYPEINFO {SetServiceEnabled} = ["function", "boolean", "boolean"]; } -sub SetServiceEnabled { +BEGIN { $TYPEINFO {WriteServiceEnabled} = ["function", "boolean", "boolean"]; } +sub WriteServiceEnabled { my $self = shift; $serviceEnabled = shift; return 1; @@ -673,10 +673,10 @@ return $registerSlp; } -BEGIN { $TYPEINFO {SetSLPEnabled} = ["function", "boolean", "boolean"]; } -sub SetSLPEnabled { +BEGIN { $TYPEINFO {WriteSLPEnabled} = ["function", "boolean", "boolean"]; } +sub WriteSLPEnabled { my $self = shift; - y2milestone("SetSlpEnabled"); + y2milestone("WriteSlpEnabled"); $registerSlp = shift; return 1; } @@ -701,20 +701,20 @@ $error{'details'} = $details; } -BEGIN { $TYPEINFO {GetError} = ["function", ["map", "string", "string"] ]; } -sub GetError +BEGIN { $TYPEINFO {ReadError} = ["function", ["map", "string", "string"] ]; } +sub ReadError { return \%error; } -BEGIN { $TYPEINFO {GetLogLevels} = ["function", [ "list", "string" ] ]; } -sub GetLogLevels +BEGIN { $TYPEINFO {ReadLogLevels} = ["function", [ "list", "string" ] ]; } +sub ReadLogLevels { return SCR->Read('.ldapserver.global.loglevel' ); } -BEGIN { $TYPEINFO {SetLogLevels} = ["function", "boolean", [ "list", "string" ] ]; } -sub SetLogLevels +BEGIN { $TYPEINFO {WriteLogLevels} = ["function", "boolean", [ "list", "string" ] ]; } +sub WriteLogLevels { my $self = shift; my $lvls = shift; @@ -722,20 +722,20 @@ return 1; } -BEGIN { $TYPEINFO {GetAllowFeatures} = ["function", [ "list", "string" ] ]; } -sub GetAllowFeatures +BEGIN { $TYPEINFO {ReadAllowFeatures} = ["function", [ "list", "string" ] ]; } +sub ReadAllowFeatures { return SCR->Read('.ldapserver.global.allow' ); } -BEGIN { $TYPEINFO {GetDisallowFeatures} = ["function", [ "list", "string" ] ]; } -sub GetDisallowFeatures +BEGIN { $TYPEINFO {ReadDisallowFeatures} = ["function", [ "list", "string" ] ]; } +sub ReadDisallowFeatures { return SCR->Read('.ldapserver.global.disallow' ); } -BEGIN { $TYPEINFO {SetAllowFeatures} = ["function", "boolean", [ "list", "string" ] ]; } -sub SetAllowFeatures +BEGIN { $TYPEINFO {WriteAllowFeatures} = ["function", "boolean", [ "list", "string" ] ]; } +sub WriteAllowFeatures { my $self = shift; my $features = shift; @@ -743,8 +743,8 @@ return 1; } -BEGIN { $TYPEINFO {SetDisallowFeatures} = ["function", "boolean", [ "list", "string" ] ]; } -sub SetDisallowFeatures +BEGIN { $TYPEINFO {WriteDisallowFeatures} = ["function", "boolean", [ "list", "string" ] ]; } +sub WriteDisallowFeatures { my $self = shift; my $features = shift; @@ -752,14 +752,14 @@ return 1; } -BEGIN { $TYPEINFO {GetTlsConfig} = ["function", [ "map", "string", "any" ] ]; } -sub GetTlsConfig +BEGIN { $TYPEINFO {ReadTlsConfig} = ["function", [ "map", "string", "any" ] ]; } +sub ReadTlsConfig { return SCR->Read('.ldapserver.global.tlsSettings' ); } -BEGIN { $TYPEINFO {SetTlsConfig} = ["function", "boolean", [ "map", "string", "any" ] ]; } -sub SetTlsConfig +BEGIN { $TYPEINFO {WriteTlsConfig} = ["function", "boolean", [ "map", "string", "any" ] ]; } +sub WriteTlsConfig { my $self = shift; my $tls = shift; @@ -794,8 +794,8 @@ return 1; } -BEGIN { $TYPEINFO {SetTlsConfigCommonCert} = ["function", "boolean" ]; } -sub SetTlsConfigCommonCert +BEGIN { $TYPEINFO {WriteTlsConfigCommonCert} = ["function", "boolean" ]; } +sub WriteTlsConfigCommonCert { my $self = shift; my $ret = SCR->Execute(".target.bash", @@ -816,7 +816,7 @@ "crlCheck" => 0, "verifyClient" => 0 }; - return $self->SetTlsConfig( $tlsSettings ); + return $self->WriteTlsConfig( $tlsSettings ); } BEGIN { $TYPEINFO {MigrateSlapdConf} = ["function", "boolean"]; } @@ -886,10 +886,10 @@ return 1; } -BEGIN { $TYPEINFO {GetInitialDefaults} = ["function", [ "map", "string", "any"] ]; } -sub GetInitialDefaults +BEGIN { $TYPEINFO {CreateInitialDefaults} = ["function", [ "map", "string", "any"] ]; } +sub CreateInitialDefaults { - y2milestone("GetInitialDefaults"); + y2milestone("CreateInitialDefaults"); my $self = shift; if ( ! keys(%dbDefaults ) ) { $self->InitDbDefaults(); @@ -965,8 +965,8 @@ } else { - $self->SetTlsConfigCommonCert(); - $self->SetProtocolListenerEnabled("ldaps", 1); + $self->WriteTlsConfigCommonCert(); + $self->WriteProtocolListenerEnabled("ldaps", 1); } $globals_initialized = 1; } @@ -1045,10 +1045,10 @@ return 1; } -BEGIN { $TYPEINFO {GetDatabaseList} = ["function", [ "list", [ "map" , "string", "string"] ] ]; } -sub GetDatabaseList +BEGIN { $TYPEINFO {ReadDatabaseList} = ["function", [ "list", [ "map" , "string", "string"] ] ]; } +sub ReadDatabaseList { - y2milestone("GetDatabaseList"); + y2milestone("ReadDatabaseList"); my $self = shift; my $ret = (); my $rc = SCR->Read('.ldapserver.databases'); @@ -1063,21 +1063,21 @@ return $ret } -BEGIN { $TYPEINFO {GetDatabase} = ["function", [ "map" , "string", "string"], "integer" ]; } -sub GetDatabase +BEGIN { $TYPEINFO {ReadDatabase} = ["function", [ "map" , "string", "string"], "integer" ]; } +sub ReadDatabase { my ($self, $index) = @_; - y2milestone("GetDatabase ".$index); + y2milestone("ReadDatabase ".$index); my $rc = SCR->Read(".ldapserver.database.{".$index."}" ); y2milestone( "Database: ".Data::Dumper->Dump([$rc]) ); return $rc; } -BEGIN { $TYPEINFO {GetDatabaseIndexes} = ["function", [ "map" , "string", [ "map", "string", "boolean" ] ], "integer" ]; } -sub GetDatabaseIndexes +BEGIN { $TYPEINFO {ReadDatabaseIndexes} = ["function", [ "map" , "string", [ "map", "string", "boolean" ] ], "integer" ]; } +sub ReadDatabaseIndexes { my ($self, $index) = @_; - y2milestone("GetDatabase ".$index); + y2milestone("ReadDatabaseIndexes ".$index); my $rc = SCR->Read(".ldapserver.database.{".$index."}.indexes" ); y2milestone( "Indexes: ".Data::Dumper->Dump([$rc]) ); return $rc; @@ -1095,21 +1095,21 @@ return $rc; } -BEGIN { $TYPEINFO {GetOverlayList} = ["function", [ "list", [ "map" , "string", "string"] ], "integer" ]; } -sub GetOverlayList +BEGIN { $TYPEINFO {ReadOverlayList} = ["function", [ "list", [ "map" , "string", "string"] ], "integer" ]; } +sub ReadOverlayList { my ($self, $index) = @_; - y2milestone("GetOverlayList ", $index); + y2milestone("ReadOverlayList ", $index); my $rc = SCR->Read(".ldapserver.database.{".$index."}.overlays" ); y2milestone( "Overlays: ".Data::Dumper->Dump([$rc]) ); return $rc; } -BEGIN { $TYPEINFO {GetPpolicyOverlay} = ["function", [ "map" , "string", "any" ], "integer" ]; } -sub GetPpolicyOverlay +BEGIN { $TYPEINFO {ReadPpolicyOverlay} = ["function", [ "map" , "string", "any" ], "integer" ]; } +sub ReadPpolicyOverlay { my ($self, $index) = @_; - y2milestone("GetPpolicyOverlay ", $index); + y2milestone("ReadPpolicyOverlay ", $index); my $rc = SCR->Read(".ldapserver.database.{".$index."}.ppolicy" ); y2milestone( "Ppolicy: ".Data::Dumper->Dump([$rc]) ); if ( defined $rc->{'hashClearText'} ) @@ -1135,7 +1135,7 @@ $ppolicy->{'useLockout'} = YaST::YCP::Boolean($ppolicy->{'useLockout'}); # slapo-ppolicy requires ppolicy schema to be loaded - my $schema = $self->GetSchemaList(); + my $schema = $self->ReadSchemaList(); if ( ! grep( /^ppolicy$/, @{$schema} ) ) { my $rc = $self->AddSchemaToSchemaList("/etc/openldap/schema/ppolicy.schema"); @@ -1155,11 +1155,11 @@ } } -BEGIN { $TYPEINFO {GetSchemaList} = ["function", [ "list" , "string"] ]; } -sub GetSchemaList +BEGIN { $TYPEINFO {ReadSchemaList} = ["function", [ "list" , "string"] ]; } +sub ReadSchemaList { my $self = @_; - y2milestone("GetSchemaList "); + y2milestone("ReadSchemaList "); my $rc = SCR->Read(".ldapserver.schemaList" ); y2milestone( "SchemaList: ".Data::Dumper->Dump([$rc]) ); return $rc; @@ -1227,7 +1227,7 @@ if ( $index == 0 ) { # calculate new database index - $index = (scalar(@{$self->GetDatabaseList()} )) - 1; + $index = (scalar(@{$self->ReadDatabaseList()} )) - 1; } $rc = SCR->Write(".ldapserver.database.new.{$index}", $db); if(! $rc ) { @@ -1330,11 +1330,11 @@ return YaST::YCP::Boolean(1); } -BEGIN { $TYPEINFO {GetProtocolListenerEnabled} = ["function", "boolean", "string" ]; } -sub GetProtocolListenerEnabled +BEGIN { $TYPEINFO {ReadProtocolListenerEnabled} = ["function", "boolean", "string" ]; } +sub ReadProtocolListenerEnabled { my ( $self, $protocol ) = @_; - y2milestone("GetProtocolListenerEnabled $protocol (ldapi $use_ldapi_listener, ldaps $use_ldaps_listener, ldap $use_ldap_listener)"); + y2milestone("ReadProtocolListenerEnabled $protocol (ldapi $use_ldapi_listener, ldaps $use_ldaps_listener, ldap $use_ldap_listener)"); if ( $protocol eq "ldap" ) { return $use_ldap_listener; @@ -1353,11 +1353,11 @@ } } -BEGIN { $TYPEINFO {SetProtocolListenerEnabled} = ["function", "boolean", "string", "boolean" ]; } -sub SetProtocolListenerEnabled +BEGIN { $TYPEINFO {WriteProtocolListenerEnabled} = ["function", "boolean", "string", "boolean" ]; } +sub WriteProtocolListenerEnabled { my ( $self, $protocol, $enabled ) = @_; - y2milestone("SetProtocolListenerEnabled $protocol $enabled"); + y2milestone("WriteProtocolListenerEnabled $protocol $enabled"); if ( $protocol eq "ldap" ) { $use_ldap_listener = $enabled; Modified: trunk/ldap-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Fri Aug 8 17:23:48 2008 @@ -189,7 +189,7 @@ symbol ret = Popup::AnyQuestion3( _("You have an existing configuration but the LDAP Server is not running currently."), _("Do you want to start it now to re-read its configuration data or do you want to create a new configuration from scratch?"), _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); if ( ret == `yes ) { - LdapServer::SetServiceEnabled( true ); + LdapServer::WriteServiceEnabled( true ); return `reread; } else if (ret == `no ) @@ -298,7 +298,7 @@ if (! LdapServer::MigrateSlapdConf()) { y2milestone("LdapServer::MigrateSlapdConf failed"); - DisplayError( LdapServer::GetError() ); + DisplayError( LdapServer::ReadError() ); return `abort; } LdapServer::Read(); @@ -422,7 +422,7 @@ if (! LdapServer::MigrateSlapdConf()) { y2milestone("LdapServer::MigrateSlapdConf failed"); - DisplayError( LdapServer::GetError() ); + DisplayError( LdapServer::ReadError() ); return `abort; } LdapServer::Read(); @@ -450,7 +450,7 @@ // LdapServer::AbortFunction = PollAbort; boolean ret = LdapServer::Write(); if (! ret ) { - map<string,string> err = LdapServer::GetError(); + map<string,string> err = LdapServer::ReadError(); if (err["details"]:"" != "" ) { Popup::ErrorDetails( err["msg"]:"", err["details"]:"" ); @@ -518,7 +518,7 @@ { if ( ! LdapServer::ReadFromDefaults() ) { - DisplayError( LdapServer::GetError() ); + DisplayError( LdapServer::ReadError() ); ret = `abort; } break; Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Fri Aug 8 17:23:48 2008 @@ -194,7 +194,7 @@ ); any EnableServiceDialog() { - map <string, any> defaults = LdapServer::GetInitialDefaults(); + map <string, any> defaults = LdapServer::CreateInitialDefaults(); map<string, any> firewall_settings = $[ "services": [ "ldap" , "ldaps" ], "display_details": true, @@ -298,7 +298,7 @@ any ProposalDialog() { - map <string, any> defaults = LdapServer::GetInitialDefaults(); + map <string, any> defaults = LdapServer::CreateInitialDefaults(); string enctype = ""; boolean useCommonCA = false; boolean common_ca_available = ( CaMgm::prop_selection == `def || CaMgm::prop_selection == `floppy || CaMgm::prop_selection == `expert ); Modified: trunk/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_prop… ============================================================================== --- trunk/ldap-server/src/ldap-server_proposal.ycp (original) +++ trunk/ldap-server/src/ldap-server_proposal.ycp Fri Aug 8 17:23:48 2008 @@ -58,13 +58,13 @@ if (!Package::Installed ("openldap2")) { y2milestone ("Openldap2 is not installed. --> service disabled"); - LdapServer::SetServiceEnabled (false); + LdapServer::WriteServiceEnabled (false); } else { - LdapServer::SetServiceEnabled( true ); + LdapServer::WriteServiceEnabled( true ); } - defaults = LdapServer::GetInitialDefaults(); + defaults = LdapServer::CreateInitialDefaults(); defaults["rootpw_clear"] = Users::GetRootPassword(); LdapServer::SetInitialDefaults(defaults); } @@ -192,8 +192,8 @@ } Progress::off(); LdapServer::ReadFromDefaults(); - LdapServer::SetServiceEnabled( true ); - LdapServer::SetLogLevels( ["none"] ); + LdapServer::WriteServiceEnabled( true ); + LdapServer::WriteLogLevels( ["none"] ); Progress::on(); if( !LdapServer::HaveCommonServerCertificate() ) { @@ -202,9 +202,9 @@ } else { - LdapServer::SetTlsConfigCommonCert(); + LdapServer::WriteTlsConfigCommonCert(); } - LdapServer::SetSLPEnabled( true ); + LdapServer::WriteSLPEnabled( true ); LdapServer::Write(); } } Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 8 17:23:48 2008 @@ -96,7 +96,7 @@ UI::ChangeWidget( `fr_listener, `Enabled, false ); UI::ChangeWidget( `fr_firewall, `Enabled, false ); } - if ( LdapServer::GetProtocolListenerEnabled("ldap") ) + if ( LdapServer::ReadProtocolListenerEnabled("ldap") ) { UI::ChangeWidget( `cb_interface_ldap, `Value, true ); } @@ -104,7 +104,7 @@ { UI::ChangeWidget( `cb_interface_ldap, `Value, false ); } - if ( LdapServer::GetProtocolListenerEnabled("ldaps") ) + if ( LdapServer::ReadProtocolListenerEnabled("ldaps") ) { UI::ChangeWidget( `cb_interface_ldaps, `Value, true ); } @@ -112,7 +112,7 @@ { UI::ChangeWidget( `cb_interface_ldaps, `Value, false ); } - if ( LdapServer::GetProtocolListenerEnabled("ldapi") ) + if ( LdapServer::ReadProtocolListenerEnabled("ldapi") ) { UI::ChangeWidget( `cb_interface_ldapi, `Value, true ); } @@ -150,40 +150,40 @@ CWMFirewallInterfaces::OpenFirewallStore (fw_widget, "", $[]); if ( serviceEnabled == `rb_yes ) { - LdapServer::SetServiceEnabled( true ); + LdapServer::WriteServiceEnabled( true ); } else { - LdapServer::SetServiceEnabled( false ); + LdapServer::WriteServiceEnabled( false ); } - LdapServer::SetProtocolListenerEnabled( "ldap", (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) ); - LdapServer::SetProtocolListenerEnabled( "ldapi", (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) ); + LdapServer::WriteProtocolListenerEnabled( "ldap", (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) ); + LdapServer::WriteProtocolListenerEnabled( "ldapi", (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) ); if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldaps ), `Value ) ) { - map<string, any> tls = LdapServer::GetTlsConfig(); + map<string, any> tls = LdapServer::ReadTlsConfig(); if ( (string)tls["caCertFile"]:"" != "" && (string)tls["certFile"]:"" != "" && (string)tls["certKeyFile"]:"" != "" ) { - LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", true ); } else { if ( Popup::YesNoHeadline( _("Your TLS/SSL Configuration seems to be incomplete."), _("Do you really want to enable the \"ldaps\" protocol listener?") ) ) { - LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", true ); } else { - LdapServer::SetProtocolListenerEnabled( "ldaps", false ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", false ); } } } else { - LdapServer::SetProtocolListenerEnabled( "ldaps", false ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", false ); } return true; } @@ -191,7 +191,7 @@ define boolean cb_read_schema() ``{ y2milestone( "calling schema read handler" ); - list<string> inclist = LdapServer::GetSchemaList(); + list<string> inclist = LdapServer::ReadSchemaList(); update_schemalist( inclist ); return true; } @@ -201,7 +201,7 @@ y2milestone( "calling schema input handler" ); - list<string> inclist = LdapServer::GetSchemaList(); + list<string> inclist = LdapServer::ReadSchemaList(); string current_item = (string)UI::QueryWidget( `sb_schemalist, `CurrentItem ); y2milestone( "current_item is '%1'", current_item ); @@ -222,20 +222,20 @@ if ( regexpmatch( new_item, ".*\.schema$" ) ) { if (! LdapServer::AddSchemaToSchemaList(new_item) ) { - map<string, string> err = LdapServer::GetError(); + map<string, string> err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; return false; } - list<string> inclist = LdapServer::GetSchemaList(); + list<string> inclist = LdapServer::ReadSchemaList(); update_schemalist( inclist ); } else if (! LdapServer::AddLdifToSchemaList(new_item) ) { - map<string, string> err = LdapServer::GetError(); + map<string, string> err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; return false; } else { - list<string> inclist = LdapServer::GetSchemaList(); + list<string> inclist = LdapServer::ReadSchemaList(); update_schemalist( inclist ); } @@ -243,7 +243,7 @@ { if( current_item == nil ) return true; LdapServer::RemoveFromSchemaList(current_item); - list<string> inclist = LdapServer::GetSchemaList(); + list<string> inclist = LdapServer::ReadSchemaList(); update_schemalist( inclist ); } return true; @@ -261,7 +261,7 @@ define boolean cb_read_loglevel() ``{ y2milestone( "calling loglevel read handler" ); - list<string> lvls = LdapServer::GetLogLevels(); + list<string> lvls = LdapServer::ReadLogLevels(); UI::ChangeWidget( `msb_loglevel, `SelectedItems, lvls ); return true; @@ -273,7 +273,7 @@ list<string> idlist = (list<string>)UI::QueryWidget( `msb_loglevel, `SelectedItems ); y2milestone( "writing loglevel: '%1'", idlist ); - return LdapServer::SetLogLevels( idlist ); + return LdapServer::WriteLogLevels( idlist ); } /***************************** @@ -288,8 +288,8 @@ define boolean cb_read_allow() ``{ y2milestone( "calling allow read handler" ); - list<string> allowlist = LdapServer::GetAllowFeatures(); - list<string> disallowlist = LdapServer::GetDisallowFeatures(); + list<string> allowlist = LdapServer::ReadAllowFeatures(); + list<string> disallowlist = LdapServer::ReadDisallowFeatures(); UI::ChangeWidget( `msb_allow, `SelectedItems, allowlist ); UI::ChangeWidget( `msb_disallow, `SelectedItems, disallowlist ); return true; @@ -304,8 +304,8 @@ disallowlist = (list<string>)UI::QueryWidget( `msb_disallow, `SelectedItems ); y2milestone( "writing allowlist: '%1'", allowlist ); - LdapServer::SetAllowFeatures( allowlist ); - LdapServer::SetDisallowFeatures( disallowlist ); + LdapServer::WriteAllowFeatures( allowlist ); + LdapServer::WriteDisallowFeatures( disallowlist ); return true; } @@ -316,7 +316,7 @@ define boolean cb_read_tls() ``{ y2milestone( "calling tls read handler" ); - map<string, any> tls = LdapServer::GetTlsConfig(); + map<string, any> tls = LdapServer::ReadTlsConfig(); y2milestone( "tls config %1", tls ); if ( (string)tls["caCertFile"]:"" != "" && (string)tls["certFile"]:"" != "" && @@ -342,7 +342,7 @@ UI::ChangeWidget( `cb_use_common_cert, `Enabled, false ); UI::ChangeWidget( `fr_import_cert, `Enabled, false ); } - UI::ChangeWidget( `cb_ssl_listener_enabled, `Value, LdapServer::GetProtocolListenerEnabled("ldaps") ); + UI::ChangeWidget( `cb_ssl_listener_enabled, `Value, LdapServer::ReadProtocolListenerEnabled("ldaps") ); UI::ChangeWidget( `te_ca_file, `Value, tls["caCertFile"]:"" ); UI::ChangeWidget( `te_cert_file, `Value, tls["certFile"]:"" ); UI::ChangeWidget( `te_key_file, `Value, tls["certKeyFile"]:"" ); @@ -383,13 +383,13 @@ callback_error = _("Please select a valid Certificate Key File"); return false; } - if ( ! LdapServer::SetTlsConfig( tlsSettings ) ) + if ( ! LdapServer::WriteTlsConfig( tlsSettings ) ) { - map<string, string> err = LdapServer::GetError(); + map<string, string> err = LdapServer::ReadError(); callback_error = err["msg"]:"" + err["details"]:""; return false; } - LdapServer::SetProtocolListenerEnabled( "ldaps", (boolean) UI::QueryWidget( `id( `cb_ssl_listener_enabled ), `Value ) ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", (boolean) UI::QueryWidget( `id( `cb_ssl_listener_enabled ), `Value ) ); } else { @@ -404,8 +404,8 @@ "verifyClient" : 0 ]; - LdapServer::SetTlsConfig( tlsSettings ); - LdapServer::SetProtocolListenerEnabled( "ldaps", false ); + LdapServer::WriteTlsConfig( tlsSettings ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", false ); } return true; } @@ -500,7 +500,7 @@ define boolean cb_read_databases() ``{ y2milestone( "calling databases read handler" ); - list<map<string,string> > dblist = LdapServer::GetDatabaseList(); + list<map<string,string> > dblist = LdapServer::ReadDatabaseList(); string text = HTML::Para( HTML::Bold( _("Available Databases:") ) )+HTML::Newline(); foreach( map<string,string> db, dblist, { string tmp = sformat("%1 (%2)", db["suffix"]:"", db["type"]:"" ); @@ -526,9 +526,9 @@ if (ret == `next ) { rebuild_widget_tree = true; - if ( ! LdapServer::AddDatabase(0, LdapDatabase::GetDatabase(), LdapDatabase::GetCreateDir() ) ) + if ( ! LdapServer::AddDatabase(0, LdapDatabase::ReadDatabase(), LdapDatabase::GetCreateDir() ) ) { - map<string, string> err = LdapServer::GetError(); + map<string, string> err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; return false; } @@ -574,7 +574,7 @@ if( db["rootdn"]:"" != "" && (boolean)UI::QueryWidget( `cb_append_basedn, `Value ) ) { - map<string,string> olddb = LdapServer::GetDatabase(index); + map<string,string> olddb = LdapServer::ReadDatabase(index); string suffix = olddb["suffix"]:""; db["rootdn"] = db["rootdn"]:"" + "," + suffix; } @@ -650,7 +650,7 @@ return false; } - map<string, string> db = LdapServer::GetDatabase( index ); + map<string, string> db = LdapServer::ReadDatabase( index ); // string suffix = (string)widget_map[current_tree_item,"name"]:nil; // if( suffix == nil ) @@ -733,7 +733,7 @@ { integer index = (integer) widget_map[current_tree_item, "index"]:nil; y2milestone("cb_read_bdb_index current item: %1, index %2", current_tree_item, index); - map<string, map<string, boolean> > idxMap = LdapServer::GetDatabaseIndexes( index ); + map<string, map<string, boolean> > idxMap = LdapServer::ReadDatabaseIndexes( index ); integer i=0; list newItems = []; foreach( string attr, map<string, boolean> idx, idxMap, { @@ -771,7 +771,7 @@ list<string> skip = []; string editAttr = ""; map<string, boolean> idx = $[]; - map<string, map<string, boolean> > idxMap = LdapServer::GetDatabaseIndexes( index ); + map<string, map<string, boolean> > idxMap = LdapServer::ReadDatabaseIndexes( index ); if (handler_cmd == `pb_idx_add ) { // skip attribute that already have an index defined foreach( string attr, map<string, boolean> idx, idxMap, @@ -836,14 +836,14 @@ y2milestone("cb_read_ppolicy()"); integer index = (integer)widget_map[current_tree_item,"index"]:nil; // Check for ppolicy overlay - map<string,any> ppolicy_map = LdapServer::GetPpolicyOverlay(index); + map<string,any> ppolicy_map = LdapServer::ReadPpolicyOverlay(index); if ( size(ppolicy_map) != 0 ){ UI::ChangeWidget( `cb_ppolicy_overlay, `Value, true ); boolean pp_hash_cleartext = (boolean)ppolicy_map["hashClearText"]:nil; boolean pp_use_lockout = (boolean)ppolicy_map["useLockout"]:nil; string pp_default = (string)ppolicy_map["defaultPolicy"]:nil; boolean pp_append_checked = false; - map<string,string> olddb = LdapServer::GetDatabase(index); + map<string,string> olddb = LdapServer::ReadDatabase(index); string suffix = olddb["suffix"]:""; integer pos = search( pp_default, suffix ); if( pos > -1 ) @@ -912,7 +912,7 @@ if (pp_default != "" ) { if( (boolean)UI::QueryWidget( `cb_pp_append_basedn, `Value ) ) { - map<string,string> db = LdapServer::GetDatabase(index); + map<string,string> db = LdapServer::ReadDatabase(index); string suffix = db["suffix"]:""; pp_default = pp_default+","+suffix; } @@ -925,11 +925,11 @@ y2milestone("Policy: %1", ppolicy); result = LdapServer::AddPasswordPolicy( index, ppolicy ); if ( ! result ) { - map<string, string> err = LdapServer::GetError(); + map<string, string> err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; } } else { - map<string,any> ppolicy_map = LdapServer::GetPpolicyOverlay(index); + map<string,any> ppolicy_map = LdapServer::ReadPpolicyOverlay(index); if ( size(ppolicy_map) == 0 ) { result = true; @@ -939,7 +939,7 @@ // delete ppolicy result = LdapServer::AddPasswordPolicy( index, $[] ); if ( ! result ) { - map<string, string> err = LdapServer::GetError(); + map<string, string> err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; } } @@ -1080,7 +1080,7 @@ y2debug( "generating database tree items" ); //generate database entries - list<map<string,string> > dblist = LdapServer::GetDatabaseList(); + list<map<string,string> > dblist = LdapServer::ReadDatabaseList(); integer i = 0; foreach( map<string,string> db, dblist, { string tmp = sformat("%1 (%2)", db["suffix"]:"", db["type"]:"" ); -- 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] r49882 - /trunk/ldap-server/src/lib/slapd-config.cpp
by rhafer＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: rhafer Date: Fri Aug 8 17:23:42 2008 New Revision: 49882 URL: http://svn.opensuse.org/viewcvs/yast?rev=49882&view=rev Log: be permissve when parsing the Schema Modified: trunk/ldap-server/src/lib/slapd-config.cpp Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Fri Aug 8 17:23:42 2008 @@ -458,7 +458,8 @@ LDAPAttrType currentAttr; std::string tmp; splitIndexFromString( *j, tmp ); - currentAttr = LDAPAttrType( tmp ); + currentAttr = LDAPAttrType( tmp, LDAP_SCHEMA_ALLOW_NO_OID | + LDAP_SCHEMA_ALLOW_QUOTED | LDAP_SCHEMA_ALLOW_OID_MACRO ); res.push_back(currentAttr); } return res; -- 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] r49881 - /trunk/doc/tdg/build-by-books.sh
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 16:53:30 2008 New Revision: 49881 URL: http://svn.opensuse.org/viewcvs/yast?rev=49881&view=rev Log: Let's include the very same file also from the other files that are stored under another directory level. Not a clean solution but should work for both server and off-line mode. Modified: trunk/doc/tdg/build-by-books.sh Modified: trunk/doc/tdg/build-by-books.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/tdg/build-by-books.sh?rev=49… ============================================================================== --- trunk/doc/tdg/build-by-books.sh (original) +++ trunk/doc/tdg/build-by-books.sh Fri Aug 8 16:53:30 2008 @@ -18,7 +18,7 @@ for bookID in `cat list_of_books.txt`; do echo "Building Book with ID "${bookID} ${XSLTPROC} --xinclude \ - --stringparam html.stylesheet ${HTMLCSS} \ + --stringparam html.stylesheet "${HTMLCSS} ../${HTMLCSS}" \ --stringparam rootid "${bookID}" \ customize-html.xsl yast.xml done -- 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] r49880 - in /branches/tmp/lslezak/product-creator-cross-arch/src: ProductCreator.ycp complex.ycp dialogs.ycp
by lslezak＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: lslezak Date: Fri Aug 8 16:50:55 2008 New Revision: 49880 URL: http://svn.opensuse.org/viewcvs/yast?rev=49880&view=rev Log: - fixed arch reset - display an error when attempting to create a kiwi image for different arch Modified: branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp Fri Aug 8 16:50:55 2008 @@ -187,9 +187,12 @@ { _arch = nil; - // set the system architecture in the package manager - y2milestone("Resetting the target architecture to '%1'", Pkg::SystemArchitecture()); - Pkg::SetArchitecture(Pkg::SystemArchitecture()); + if (Pkg::GetArchitecture() != Pkg::SystemArchitecture()) + { + // set the system architecture in the package manager + y2milestone("Resetting the target architecture to '%1'", Pkg::SystemArchitecture()); + Pkg::SetArchitecture(Pkg::SystemArchitecture()); + } } Modified: branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp Fri Aug 8 16:50:55 2008 @@ -60,6 +60,27 @@ boolean first_start = true; + // check if the selected configuration has the same target architecture as the machine architecture + // needed for creating kiwi images because kiwi cannot create cross-architecture images + boolean SameArchitecture() + { + string arch = ProductCreator::Config["arch"]:""; + string sysarch = Arch::architecture(); + + // is the target architecture different than the machine architecture? + if (arch != nil && arch != "" && arch != sysarch) + { + // error message: %1 and %2 are architecture names like i386, x86_64, ppc... + Report::Error(sformat(_("Target architecture of the current configuration (%1) +does not match the system architecture (%2). + +Kiwi cannot create images for different architectures."), arch, sysarch)); + return false; + } + + return true; + } + /** * Overview dialog * @return dialog result @@ -175,6 +196,8 @@ Package::InstallAll (["kiwi", "kiwi-desc-isoboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; + // check the architecture + if (!SameArchitecture()) continue; Kiwi::kiwi_task = "iso"; ret = `kiwi; break; @@ -183,6 +206,8 @@ Package::InstallAll (["kiwi", "kiwi-desc-xenboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; + // check the architecture + if (!SameArchitecture()) continue; Kiwi::kiwi_task = "xen"; ret = `kiwi; break; @@ -191,6 +216,8 @@ Package::InstallAll (["kiwi", "kiwi-desc-usbboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; + // check the architecture + if (!SameArchitecture()) continue; Kiwi::kiwi_task = "usb"; ret = `kiwi; break; @@ -199,6 +226,8 @@ Package::InstallAll (["kiwi", "kiwi-desc-vmxboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; + // check the architecture + if (!SameArchitecture()) continue; Kiwi::kiwi_task = "vmx"; ret = `kiwi; break; @@ -210,6 +239,10 @@ y2error("unexpected retcode: %1", ret); continue; } + + if (ret == `kiwi) + { + } } return (symbol)ret; Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Fri Aug 8 16:50:55 2008 @@ -567,11 +567,14 @@ return true; } - // the architecture is different, ask to switch + // the architecture is different, ask to switch it + // %1 is URL of the repository + // %2 is name of the architecture (like i386, x86_64, ppc...) string new_arch = AskArch( - sformat(_("The source does not support the current target architecture (%1). + sformat(_("Source %1 +does not support the current target architecture (%2). Change the target architecture? -"), ProductCreator::GetArch()), +"), general_info["url"]:"", ProductCreator::GetArch()), found_archs, found_archs[0]:""); // nil == switch has been canceled @@ -788,6 +791,7 @@ // error message Report::Error(_("There is a mismatch between the selected repositories and the machine architecture. + Either select another repositories or change the target architecture.")); -- 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] r49879 - in /trunk/core: libycp/src/YCPBuiltinFloat.cc libycp/src/YCPBuiltinList.cc package/yast2-core.changes
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 16:49:30 2008 New Revision: 49879 URL: http://svn.opensuse.org/viewcvs/yast?rev=49879&view=rev Log: Reverted two last changes even if I disagree to the current solution (list/float.html) I'm sure I don't want to write URL directly it still always depends on docbook -- how it generates the URL. Anyway, please, if anyone changes anything in documentation -- structure of files, for instance, test your changes. Don't blindly believe that it "just works". Modified: trunk/core/libycp/src/YCPBuiltinFloat.cc trunk/core/libycp/src/YCPBuiltinList.cc trunk/core/package/yast2-core.changes Modified: trunk/core/libycp/src/YCPBuiltinFloat.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinFloat.… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinFloat.cc (original) +++ trunk/core/libycp/src/YCPBuiltinFloat.cc Fri Aug 8 16:49:30 2008 @@ -136,7 +136,6 @@ { /** * @builtin float::abs - * @id float--abs * @short absolute value * @description * Returns absolute value of f. @@ -158,7 +157,6 @@ { /** * @builtin float::floor - * @id float--floor * @short round downwards to integer * @description * Returns f rounded downwards to the nearest integer. @@ -180,7 +178,6 @@ { /** * @builtin float::ceil - * @id float--ceil * @short round upwards to integer * @description * Returns f rounded upwards to the nearest integer. @@ -202,7 +199,6 @@ { /** * @builtin float::trunc - * @id float--trunc * @short round to integer, towards zero * @description * Returns f rounded to the nearest integer, towards zero. @@ -224,7 +220,6 @@ { /** * @builtin float::pow - * @id float--pow * @short power function * @description * Returns the value of f1 raised to the power of f2. Modified: trunk/core/libycp/src/YCPBuiltinList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinList.c… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinList.cc (original) +++ trunk/core/libycp/src/YCPBuiltinList.cc Fri Aug 8 16:49:30 2008 @@ -1097,7 +1097,7 @@ { /** * @builtin list::reduce - * @id list--reduce-internal + * @id list.reduce-internal * @short Reduces a list to a single value. * @param flex1 x * @param flex1 y @@ -1167,7 +1167,7 @@ { /** * @builtin list::reduce - * @id list--reduce-external + * @id list.reduce-external * @short Reduces a list to a single value. * @param flex1 x * @param flex2 y Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Aug 8 16:49:30 2008 @@ -3,8 +3,6 @@ - Re-added support to build libycp documentation in separate files additionally to combined.xml (needed for overall documentation). -- Dots in @ids for *::* builtins replaced with double dashes. -- Added @ids for *::* where missing (needed for docu). ------------------------------------------------------------------- Wed Jul 30 15:22:15 CEST 2008 - mvidner(a)suse.cz -- 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] r49878 - in /trunk/storage/libstorage/src: StorageInterface.h Volume.cc
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 16:36:43 2008 New Revision: 49878 URL: http://svn.opensuse.org/viewcvs/yast?rev=49878&view=rev Log: - fixed error number - shell quoting Modified: trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/Volume.cc 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 Fri Aug 8 16:36:43 2008 @@ -522,6 +522,7 @@ VOLUME_FORMAT_NFS_IMPOSSIBLE = -3037, VOLUME_CRYPT_NFS_IMPOSSIBLE = -3038, VOLUME_REMOUNT_FAILED = -3039, + VOLUME_TUNEREISERFS_FAILED = -3040, LVM_CREATE_PV_FAILED = -4000, LVM_PV_ALREADY_CONTAINED = -4001, 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 Fri Aug 8 16:36:43 2008 @@ -830,7 +830,7 @@ string cmd = "/sbin/reiserfstune " + tunefs_opt + " " + quote(mountDevice()); SystemCmd c( cmd ); if( c.retcode()!=0 ) - ret = VOLUME_TUNE2FS_FAILED; + ret = VOLUME_TUNEREISERFS_FAILED; } } if( ret==0 ) @@ -1263,7 +1263,7 @@ } if( ret==0 ) { - cmd = "xfs_growfs " + mpoint; + cmd = "xfs_growfs " + quote(mpoint); c.execute( cmd ); if( c.retcode()!=0 ) { @@ -1461,7 +1461,7 @@ int ret = 0; if( loop_dev.empty() ) { - SystemCmd c(LOSETUPBIN " -a" ); + SystemCmd c(LOSETUPBIN " -a"); ret = getFreeLoop( c ); } y2milestone( "ret:%d", ret ); @@ -1472,7 +1472,7 @@ { string cmd = LOSETUPBIN " " + quote(loop_dev) + " "; const Loop* l = static_cast<const Loop*>(this); - cmd += l->lfileRealPath(); + cmd += quote(l->lfileRealPath()); y2milestone( "cmd:%s", cmd.c_str() ); return( cmd ); } @@ -1530,35 +1530,35 @@ case ENC_LUKS: cmd += " --key-file " + pwdf; cmd += " luksOpen "; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); cmd += ' '; - cmd += table; + cmd += quote(table); break; case ENC_TWOFISH: cmd += " --hash sha512 --cipher twofish"; cmd += " create "; - cmd += table; + cmd += quote(table); cmd += ' '; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); cmd += " < " + pwdf; break; case ENC_TWOFISH_OLD: cmd += " --hash ripemd160:20 --cipher twofish-cbc-null --key-size 192"; cmd += " create "; - cmd += table; + cmd += quote(table); cmd += ' '; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); cmd += " < " + pwdf; break; case ENC_TWOFISH256_OLD: cmd += " --hash sha512 --cipher twofish-cbc-null --key-size 256"; cmd += " create "; - cmd += table; + cmd += quote(table); cmd += ' '; - cmd += is_loop?loop_dev:dev; + cmd += quote(is_loop?loop_dev:dev); cmd += " < " + pwdf; break; @@ -1883,7 +1883,7 @@ if( cmd.retcode()!=0 ) ret = VOLUME_CRYPTFORMAT_FAILED; if( ret==0 && mp=="swap" ) - cmd.execute( "mkswap " + dmcrypt_dev ); + cmd.execute("mkswap " + quote(dmcrypt_dev)); } } if( ret==0 && (!isTmpCryptMp(mp)||!crypt_pwd.empty()) ) -- 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] r49877 - in /trunk/bootloader/src: modules/BootCommon.ycp routines/misc.ycp
by juhliarik＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: juhliarik Date: Fri Aug 8 16:23:03 2008 New Revision: 49877 URL: http://svn.opensuse.org/viewcvs/yast?rev=49877&view=rev Log: - reimmplementation converting to persistent device names and back M bootloader/src/modules/BootCommon.ycp * added support converting devices * added support for exporting M bootloader/src/routines/misc.ycp * added function for converting: + remapDeviceMap(map<string,string> device_map) + remapGlobals(map<string,string> globals_set) + remapResume(string append) + remapSections(list<map<string,any> >sec) Modified: trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Fri Aug 8 16:23:03 2008 @@ -466,7 +466,7 @@ : ""; // try to use label or udev id for device name... FATE #302219 if ((resume != "") && (resume != nil)) - resume = DevToLabelUdevID(resume); + resume = Dev2MountByDev(resume); // FIXME: @@ -589,7 +589,7 @@ "image" : kernel_fn, "initrd" : initrd_fn, // try to use label or udev id for device name... FATE #302219 - "root" : DevToLabelUdevID(RootPartitionDevice), + "root" : Dev2MountByDev(RootPartitionDevice), "append" : (title == "failsafe") ? BootArch::FailsafeKernelParams () : BootArch::DefaultKernelParams (resume), @@ -633,10 +633,11 @@ * @return bootloader settings */ global define map Export () { + MapDevices(); map exp = $[ - "global": globals, - "sections" : sections, - "device_map" : device_mapping, + "global": remapGlobals(globals), + "sections" : remapSections(sections), + "device_map" : remapDeviceMap(device_mapping), ]; if ( ! ( loader_type == "grub" ) ) { exp["repl_mbr"] = repl_mbr; @@ -703,8 +704,7 @@ k = Storage::SLES9PersistentDevNames(k); y2milestone( "devmap: dev name after SLES9 persistent dev name translation: %1", k); } - //return $[BootCommon::MountByDev2Dev(k) : v]; - return $[DevToLabelUdevID(k) : v]; + return $[Dev2MountByDev(k) : v]; }); // convert custom boot device names in globals to the kernel device names @@ -717,8 +717,7 @@ v = Storage::SLES9PersistentDevNames(v); y2milestone( "globals: dev name after SLES9 persistent dev name translation: %1", v); } - //return $[k : BootCommon::MountByDev2Dev(v)]; - return $[k : DevToLabelUdevID(v)]; + return $[k : Dev2MountByDev(v)]; } else { return $[k : v]; } @@ -734,8 +733,7 @@ rdev = Storage::SLES9PersistentDevNames(rdev); y2milestone( "sections: dev name after SLES9 persistent dev name translation: %1", rdev); } - //s["root"] = BootCommon::MountByDev2Dev(rdev); - s["root"] = DevToLabelUdevID(rdev); + s["root"] = Dev2MountByDev(rdev); return s; }); return true; @@ -816,7 +814,7 @@ map<string,string> my_globals = mapmap (string k , string v, globals, { if ( k == "stage1_dev" || regexpmatch(k, "^boot_.*custom$" ) ) //return $[k : BootCommon::Dev2MountByDev(v)]; - return $[k : BootCommon::DevToLabelUdevID(v)]; + return $[k : BootCommon::Dev2MountByDev(v)]; else return $[k : v]; }); @@ -826,7 +824,7 @@ map<string,string> my_device_mapping = mapmap (string k , string v, device_mapping, { //return $[BootCommon::Dev2MountByDev(k) : v]; - return $[BootCommon::DevToLabelUdevID(k) : v]; + return $[BootCommon::Dev2MountByDev(k) : v]; }); ret = ret && SetDeviceMap (my_device_mapping); Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Fri Aug 8 16:23:03 2008 @@ -159,17 +159,7 @@ return pth; } - /** - * Converts a "/dev/disk/by-" device name to the corresponding kernel - * device name, if a mapping for this name can be found in the map from - * yast2-storage. If the given device name is not a "/dev/disk/by-" device - * name, it is left unchanged. Also, if the information about the device - * name cannot be found in the target map from yast2-storage, the device - * name is left unchanged. - * - * @param dev string device name - * @return string kernel device name - */ +/* global define string MountByDev2Dev(string dev) ``{ y2milestone ("MountByDev2Dev: %1", dev); @@ -212,17 +202,282 @@ y2milestone ("MountByDev2Dev: ret %1", ret); return ret; } +*/ +global map<string,string> uuid_partitions = $[]; +global map<string,string> id_partitions = $[]; +global map<string,string> label_partitions = $[]; +global map<string,string> path_partitions = $[]; + +global map<string,string> uuid_disks = $[]; +global map<string,string> id_disks = $[]; +global map<string,string> path_disks = $[]; + +/** FATE #302219 - Use and choose persistent device names for disk devices + * Function prepare maps with mapping disks and partitions by uuid, id, path + * and label. + * + */ - /** - * Converts a device name to the corresponding device name it should be - * mounted by, according to the "mountby" setting for the device from - * yast2-storage. As a safeguard against problems, if the "mountby" device - * name does not exist in the information from yast2-storage, it will - * fallback to the "kernel name" ("/dev/hda1"). - * - * @param dev string device name - * @return string device name according to "mountby" - */ +global void MapDevices() +{ + string dev_by_something = ""; + map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); + foreach (string k, map v, devices, + { + // map disk by uuid + if ((v["uuid"]:nil != "") && (v["uuid"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-uuid/"+v["uuid"]:""; + uuid_disks[dev_by_something]= k; + } + // map disk by path + if ((v["path"]:nil != "") && (v["path"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-path/"+v["path"]:""; + path_disks[dev_by_something]= k; + } + // map disk by id + if ((v["udev_id"]:nil != nil) && (v["udev_id", 0]:nil != "")) + { + dev_by_something = "/dev/disk/by-id/"+v["udev_id", 0]:""; + id_disks[dev_by_something] = k; + } + // map partitions from disk... + + foreach (map p, (list<map>)(v["partitions"]:[]), + { + // map partition by uuid + if ((p["uuid"]:nil != "") && (p["uuid"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-uuid/"+p["uuid"]:""; + uuid_partitions[dev_by_something]= p["device"]:""; + } + + // map partition by path + if ((p["path"]:nil != "") && (p["path"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-path/"+p["path"]:""; + path_partitions[dev_by_something]= p["device"]:""; + } + + // map partition by path + if ((p["label"]:nil != "") && (p["label"]:nil != nil)) + { + dev_by_something = "/dev/disk/by-label/"+p["label"]:""; + label_partitions[dev_by_something]= p["device"]:""; + } + + // map disk by id + if ((p["udev_id"]:nil != nil) && (p["udev_id", 0]:nil != "")) + { + dev_by_something = "/dev/disk/by-id/"+p["udev_id", 0]:""; + id_partitions[dev_by_something] = p["device"]:""; + } + + }); // end of foreach (map p, (list<map>)(v["partitions"]:[]), + }); // end of foreach (string k, map v, devices, + + y2milestone("disks mapping by-id: %1", id_disks); + y2milestone("disks mapping by-uuid: %1", uuid_disks); + y2milestone("disks mapping by-path: %1", path_disks); + + y2milestone("partitions mapping by-id: %1", id_partitions); + y2milestone("partitions mapping by-uuid: %1", uuid_partitions); + y2milestone("partitions mapping by-path: %1", path_partitions); + y2milestone("partitions mapping by-label: %1", label_partitions); +} + + +/** FATE #302219 - Use and choose persistent device names for disk devices + * Converts a "/dev/disk/by-" device name to the corresponding kernel + * device name, if a mapping for this name can be found in the map from + * yast2-storage. If the given device name is not a "/dev/disk/by-" device + * name, it is left unchanged. Also, if the information about the device + * name cannot be found in the target map from yast2-storage, the device + * name is left unchanged. + * + * @param dev string device name + * @return string kernel device name + */ + +global define string MountByDev2Dev(string dev) +{ + y2milestone ("MountByDev2Dev: %1", dev); + + if (!regexpmatch(dev, "^/dev/disk/by-")) + return dev; + string ret = dev; + + // check if it is device name by id + if (search(dev, "/dev/disk/by-id/") != nil) + { + if (haskey(id_partitions, dev)) + ret = id_partitions[dev]:""; + + if (haskey(id_disks, dev)) + ret = id_disks[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + // check if it is device name by uuid + if (search(dev, "/dev/disk/by-uuid/") != nil) + { + if (haskey(uuid_partitions, dev)) + ret = uuid_partitions[dev]:""; + + if (haskey(uuid_disks, dev)) + ret = uuid_disks[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + // check if it is device name by path + if (search(dev, "/dev/disk/by-path/") != nil) + { + if (haskey(path_partitions, dev)) + ret = path_partitions[dev]:""; + + if (haskey(path_disks, dev)) + ret = path_disks[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + // check if it is device name by label + // only partition are supported + if (search(dev, "/dev/disk/by-label/") != nil) + { + if (haskey(label_partitions, dev)) + ret = label_partitions[dev]:""; + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; + } + + y2milestone("Device %1 was converted to: %2", dev, ret); + return ret; +} +/** + * Function remap device map to device name (/dev/sda) + * or to label (ufo_disk) + * @param map<string,string> device map + * @return map<string,string> new device map + */ + +global map<string,string> remapDeviceMap(map<string,string> device_map) +{ + symbol by_mount = `id; //Storage::GetDefaultMountBy(); + + if (by_mount == `label) + return device_map; + + map<string,string> ret = $[]; + // convert device names in device map to the device names by device or label + ret = mapmap (string k , string v, device_mapping, + { + return $[BootCommon::MountByDev2Dev(k) : v]; + }); + + return ret; +} + +/** + * Function remap globals settings "boot_custom" device name (/dev/sda) + * or to label (ufo_partition) + * @param map<string,string> globals + * @return map<string,string> globals + */ + +global map<string,string> remapGlobals(map<string,string> globals_set) +{ + symbol by_mount = `id; //Storage::GetDefaultMountBy(); + + if (by_mount == `label) + return globals_set; + + if (haskey(globals_set, "boot_custom")) + { + globals_set["boot_custom"] = BootCommon::MountByDev2Dev(globals_set["boot_custom"]:""); + } + + return globals_set; +} + +/** + * Function remap "resume" from section (append) to device name (/dev/sda) + * or to label (ufo_partition) + * @param map<string,any> sections + * @return map<string,any> sections + */ + +define string remapResume(string append) +{ + if ((search(append, "resume")!=nil) && (search(append, "noresume") == nil)) + { + list <string> list_append = splitstring (append, " "); + list_append = add(list_append, foreach(string key, list_append, + { + if (search(key,"resume") != nil) + { + list <string> resume_arg = splitstring(key, "="); + string dev = resume_arg[1]:""; + if (dev != "") + return "resume="+BootCommon::MountByDev2Dev(dev); + else + return key; + } else { + return key; + } + })); + + string ret = mergestring(list_append, " "); + return ret; + + } else { + return append; + } +} + +/** + * Function remap section "root" and "resume" to device name (/dev/sda) + * or to label (ufo_partition) + * @param list<map<string,any> > list of sections + * @return list<map<string,any> > list of sections + */ + +global list<map<string,any> > remapSections(list<map<string,any> >sec) +{ + symbol by_mount = `id; //Storage::GetDefaultMountBy(); + + if (by_mount == `label) + return sec; + + list<map<string,any> >temp_sec = []; + + // convert root and resume device names in sections to kernel device names + temp_sec = maplist (map<string,any> s, sections, + { + + if (s["root"]:"" != "") + { + string rdev = s["root"]:""; + s["root"] = BootCommon::MountByDev2Dev(rdev); + + if (s["append"]:"" != "") + s["append"] = remapResume(s["append"]:""); + } + + if (s["chainloader"]:"" != "") + s["chainloader"] = BootCommon::MountByDev2Dev(s["chainloader"]:""); + + return s; + }); + + return temp_sec; +} + + +/* global define string Dev2MountByDev(string dev) ``{ y2milestone ("Dev2MountByDev: %1", dev); map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); @@ -257,6 +512,119 @@ y2milestone ("Dev2MountByDev: ret %1", ret); return ret; } +*/ +/** FATE #302219 - Use and choose persistent device names for disk devices + * Converts a device name to the corresponding device name it should be + * mounted by, according to the "mountby" setting for the device from + * yast2-storage. As a safeguard against problems, if the "mountby" device + * name does not exist in the information from yast2-storage, it will + * fallback to the "kernel name" ("/dev/sdXY"). + * + * @param dev string device name + * @return string device name according to "mountby" + */ +global define string Dev2MountByDev(string dev) +{ + y2milestone ("Dev2MountByDev: %1", dev); + + // (`id,`uuid,`path,`device,`label) + symbol by_mount = `id; //Storage::GetDefaultMountBy(); + + y2milestone("Default mount by is %1", by_mount); + + map<string,map> devices = (map<string,map>)Storage::GetTargetMap(); + + // make a map: "/dev/hda1" -> info_map_for_this_partition + map<string,map> partitions = $[]; + foreach (string k, map v, devices, + { + foreach (map p, (list<map>)(v["partitions"]:[]), + { + partitions[p["device"]:""] = p; + }); + }); + + string ret = dev; + switch(by_mount) + { + // convert to udev_id + case (`id): + // partitions + if ((partitions[dev, "udev_id"]:nil != nil) && (partitions[dev, "udev_id", 0]:nil != "")) + { + ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "udev_id", 0]:""); + y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); + return ret; + } + // disks + if ((devices[dev, "udev_id"]:nil != nil) && (devices[dev, "udev_id", 0]:nil != "")) + { + ret = sformat ("/dev/disk/by-id/%1", devices[dev, "udev_id", 0]:""); + y2milestone ("Device name: %1 is converted to udev id: %2", dev, ret); + return ret; + } + break; + + // convert to uuid + case (`uuid): + // partitions + if ((partitions[dev, "uuid"]:nil != nil) && (partitions[dev, "uuid"]:nil != "")) + { + ret = sformat ("/dev/disk/by-uuid/%1", partitions[dev, "uuid"]:""); + y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); + return ret; + } + // disks + if ((devices[dev, "uuid"]:nil != nil) && (devices[dev, "uuid"]:nil != "")) + { + ret = sformat ("/dev/disk/by-uuid/%1", devices[dev, "uuid"]:""); + y2milestone ("Device name: %1 is converted to uuid: %2", dev, ret); + return ret; + } + break; + + // convert to udev_path + case (`path): + // partitions + if ((partitions[dev, "udev_path"]:nil != nil) && (partitions[dev, "udev_path"]:nil != "")) + { + ret = sformat ("/dev/disk/by-path/%1", partitions[dev, "udev_path"]:""); + y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); + return ret; + } + // disks + if ((devices[dev, "udev_path"]:nil != nil) && (devices[dev, "udev_path"]:nil != "")) + { + ret = sformat ("/dev/disk/by-path/%1", devices[dev, "udev_path"]:""); + y2milestone ("Device name: %1 is converted to udev path: %2", dev, ret); + return ret; + } + break; + + // convert to label + case (`label): + // partitions + if ((partitions[dev, "label"]:nil != nil) && (partitions[dev, "label"]:nil != "")) + { + ret = sformat ("/dev/disk/by-label/%1", partitions[dev, "label"]:""); + y2milestone ("Device name: %1 is converted to label: %2", dev, ret); + return ret; + } + // disks + y2milestone ("Disk doesn't support labels - name: %1 is converted to label: %2", dev, ret); + return ret; + break; + + // convert to device or uknown type + default: + y2milestone ("Convert %1 to `device or unknwn type, result: %2", dev, ret); + return ret; + break; + } + + return ret; +} + /** * Converts a device name to the label (if it used) than try to udev id (if it used) @@ -1599,7 +1967,7 @@ string boot_disk = p_dev["disk"]:""; - device = DevToLabelUdevID(boot_disk); + device = Dev2MountByDev(boot_disk); y2milestone("Boot disk is %1 and his udev id is: %2", boot_disk, device); return device; } -- 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] r49876 - /trunk/libyui-bindings/swig/python/examples/widgets.py
by kkaempf＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: kkaempf Date: Fri Aug 8 16:21:00 2008 New Revision: 49876 URL: http://svn.opensuse.org/viewcvs/yast?rev=49876&view=rev Log: update, now more widgets Modified: trunk/libyui-bindings/swig/python/examples/widgets.py Modified: trunk/libyui-bindings/swig/python/examples/widgets.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui-bindings/swig/python/exam… ============================================================================== --- trunk/libyui-bindings/swig/python/examples/widgets.py (original) +++ trunk/libyui-bindings/swig/python/examples/widgets.py Fri Aug 8 16:21:00 2008 @@ -17,8 +17,17 @@ #################################### # LOCALE (important for TERMINAL!) # #################################### -# set the locale to $ENV +# set the locale to de/utf-8 locale.setlocale(locale.LC_ALL, "") +log = yui.YUILog.instance() +log.setLogFileName("debug.log") +log.enableDebugLogging( True ) +appl = yui.YUI.application() +appl.setLanguage( "de", "UTF-8" ) +#appl.setConsoleFont(magic, font, screenMap, unicodeMap, language) +# see /usr/share/YaST2/data/consolefonts.ycp +appl.setConsoleFont("(K", "lat9w-16.psfu", "trivial", "", "en_US.UTF-8") + ################# # class widgets # @@ -44,9 +53,11 @@ # | x | code | # +---+-----------+ self.mainhbox = self.factory.createHBox(self.dialog) - self.selbox = self.factory.createSelectionBox(self.mainhbox, "Widgets") - self.selbox.setWeight(0,20) + self.mainvbox = self.factory.createVBox(self.mainhbox) + self.mainvbox.setWeight(0,20) + self.selbox = self.factory.createSelectionBox(self.mainvbox, "Widgets") self.selbox.setNotify() + self.closebutton = self.factory.createPushButton(self.mainvbox, "&Close") self.boxright = self.factory.createVBox(self.mainhbox) self.boxright.setWeight(0,80) self.framedisplay = self.factory.createFrame(self.boxright, "View") @@ -117,10 +128,15 @@ if event.eventType() == yui.YEvent.CancelEvent: self.dialog.destroy() break + if event.widget() == self.closebutton: + self.dialog.destroy() + break if event.widget() == self.selbox: + self.dialog.startMultipleChanges() self.updatedisplay() self.updatedescription() self.updatecode() + self.dialog.doneMultipleChanges() if __name__ == "__main__": avwidgets = {} @@ -138,7 +154,7 @@ myComboBox.addItem("Item") Event: - if event.widget == myComboBox: + if event.widget() == myComboBox: dosomething() """] avwidgets["InputField"]=['createInputField(self.display, "Inputfield")', '.setValue("Input nonsense here")', @@ -149,8 +165,64 @@ myInputField.setValue("Insert valid input here") myInputField.setValidChars("abcdefghijklmnopqrstuvwxyz") Event: - if event.widget = myInputField: + if event.widget() = myInputField: value = myInputField.value() """] + avwidgets["CheckBox"] =['createCheckBox(self.display, "Checkbox")', + '.setChecked(True)', + None, + """This Widget is a Checkbox""", + """Code: + myCheckBox = fatory.createCheckbox(parentWidget, "Name") + myCheckbox.setEnabled(True) + Event: + if event.widget() == myCheckbox: + if myCheckbox.isChecked(): + print "Box is checked" + """] + avwidgets["Frame"] =['createFrame(self.display, "Frame")', + '.setStretchable(0,True)', + None, + """This Widget is a Frame. It can hold other widgets (vbox,hbox,single widget).""", + """Code: + myFrame = factory.createFrame(parentWidget, "Name") + """] + avwidgets["Label"] =['createLabel(self.display, "Label")', + None, + None, + """This Widget is a Label""", + """Code: + myLabel = factory.createLabel(parentWidget, "LabelText") + """] + avwidgets["LogView"] =['createLogView(self.display, "LogView", 10, 10)', + '.appendLines("Logtext1 ")', + '.appendLines("Logtext2 ")', + """This Widget is a Log-window.""", + """Code: + myLogView = factory.createLogView(parentWidget, "Name", nrLinesShown, nrLinesCached) + myLogView.appendLines("Logtext1") + """] # can't use \n in Logtext1 ... need to check + avwidgets["ProgressBar"]=['createProgressBar(self.display, "ProgressBar", 100)', + '.setValue(10)', + None, + """This Widget is a ProgressBar.""", + """Code: + myProgressBar = factory.createProgressBar(parentWidget, "Name", maxpercentvalue) + e.g.: + myProgressBar = factory.createProgressBar(dialog, "Progress", 100") + myProgressBar.setValue(33) + """] + avwidgets["SelectionBox"]=['createSelectionBox(self.display, "Selection")', + '.addItem("SELBOX_item1")', + '.addItem("SELBOX_item2")', + """This Widget is a SelectionBox""", + """Code: + mySelectionBox = factory.createSelectionBox(parentWidget, "Name") + mySelectionBox.addItem("Item1") + Event: + if event.widget() = mySelectionBox: + selected = mySelectionBox.selectedItem() + """] MY_MAIN_GUI = WIDGETS(avwidgets) - MY_MAIN_GUI.handleevent() \ No newline at end of file + MY_MAIN_GUI.handleevent() + -- 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] r49875 - /trunk/storage/storage/src/include/ep-main.ycp
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 16:11:47 2008 New Revision: 49875 URL: http://svn.opensuse.org/viewcvs/yast?rev=49875&view=rev Log: - cleanup Modified: trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Fri Aug 8 16:11:47 2008 @@ -211,11 +211,10 @@ } else if (ret1 == `apply || ret1 == `finish) { - StorageSettings::Save(); - Wizard::CreateDialog(); Wizard::SetDesktopIcon("disk"); symbol ret2 = (symbol) WFM::CallFunction("inst_prepdisk", [true, true]); + StorageSettings::Save(); Wizard::CloseDialog(); Storage::CreateTargetBackup("expert-partitioner"); @@ -247,12 +246,11 @@ term contents = `MarginBox(0.5, 0.5, `HBox( `HWeight(30, - `VBox( - `Tree(`id(`tree), `opt(`notify), _("System View"), tree) - ) + `Tree(`id(`tree), `opt(`notify), _("System View"), tree) ), `HWeight(70, - `ReplacePoint(`id(`tree_panel), TreePanel::empty_panel)) + `ReplacePoint(`id(`tree_panel), TreePanel::empty_panel) + ) ) ); @@ -275,13 +273,13 @@ case `abort: { if (!Storage::EqualBackupStates("expert-partitioner", "", true)) { - // popup text %1 will be replaces with button text - string txt = sformat(_("You have changed the partitioning. + // popup text, %1 will be replaces with button text + string text = sformat(_("You have changed the partitioning. These changes are lost if you exit the main dialog with %1. Really quit the main dialog? -"), deletechars(back_label, "&")); // TODO +"), deletechars(back_label, "&")); - if (!Popup::YesNo(txt)) + if (!Popup::YesNo(text)) { widget = `again; } -- 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] r49874 - /trunk/storage/storage/src/include/raid_lib.ycp
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 15:48:26 2008 New Revision: 49874 URL: http://svn.opensuse.org/viewcvs/yast?rev=49874&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/include/raid_lib.ycp Modified: trunk/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/raid… ============================================================================== --- trunk/storage/storage/src/include/raid_lib.ycp (original) +++ trunk/storage/storage/src/include/raid_lib.ycp Fri Aug 8 15:48:26 2008 @@ -78,20 +78,6 @@ }; - -/** - * Update Raid ComboBox - * - */ -define void new_raid_list( list<term> all_raids ) - ``{ - y2milestone( "Update Raid ComboBox: all md devices: %1 " , all_raids ); - UI::ReplaceWidget( `id(`raids_rp) , `ComboBox(`id(`raids), `opt(`notify), - // label text - _("R&AID:"),all_raids )); - }; - - /* * Get all partitions, we can probably use as raid devices * Add needed information: is_raid, disksize @@ -168,63 +154,6 @@ /** - * belongs the the partition "id" already to a raid - * if YES: popup a proper Message and return(false) - */ -define boolean CheckItemIsNotRaid( map<string,map> tg, string id ) - ``{ - y2debug("Check Item is not Raid "); - // error case: - if( id!=nil && size(id) > 0 ) - { - if( !isItemRd(tg,id) ) - { - return( true ); - } - // Message popup - Popup::Message (sformat(_("Item %1 is already a RAID device. -You cannot add it again. -"), id)); - } - else - { - //Message popup - Popup::Message(_("You have to select one device in the table")); - } - - return( false ); - }; - - -/** - * belongs the the partition "id" already to a raid? - * if NO: popup a proper Message and return(false) - **/ -define boolean CheckItemIsRaid( map<string,map> tg, string id ) - ``{ - // error case: - if( id!=nil && size(id) > 0 ) - { - if( isItemRd(tg,id) ) - { - return( true ); - } - // Message popup - Popup::Message (sformat(_("Item %1 cannot be removed. -It does not belong to a RAID. -"), id )); - } - else - { - //Message popup - Popup::Message (_("You have to select one device in the table")); - } - - return( false ); - }; - - -/** * number for /dev/mdX, 0 for /dev/md0, 1 for /dev/md1 */ define integer get_free_raid_nr( map<string,map> targetMap, integer min ) -- 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] r49873 - in /trunk/core: libycp/src/YCPBuiltinFloat.cc libycp/src/YCPBuiltinList.cc package/yast2-core.changes
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 15:36:02 2008 New Revision: 49873 URL: http://svn.opensuse.org/viewcvs/yast?rev=49873&view=rev Log: - Dots in @ids for *::* builtins replaced with double dashes. - Added @ids for *::* where missing (needed for docu). Modified: trunk/core/libycp/src/YCPBuiltinFloat.cc trunk/core/libycp/src/YCPBuiltinList.cc trunk/core/package/yast2-core.changes Modified: trunk/core/libycp/src/YCPBuiltinFloat.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinFloat.… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinFloat.cc (original) +++ trunk/core/libycp/src/YCPBuiltinFloat.cc Fri Aug 8 15:36:02 2008 @@ -136,6 +136,7 @@ { /** * @builtin float::abs + * @id float--abs * @short absolute value * @description * Returns absolute value of f. @@ -157,6 +158,7 @@ { /** * @builtin float::floor + * @id float--floor * @short round downwards to integer * @description * Returns f rounded downwards to the nearest integer. @@ -178,6 +180,7 @@ { /** * @builtin float::ceil + * @id float--ceil * @short round upwards to integer * @description * Returns f rounded upwards to the nearest integer. @@ -199,6 +202,7 @@ { /** * @builtin float::trunc + * @id float--trunc * @short round to integer, towards zero * @description * Returns f rounded to the nearest integer, towards zero. @@ -220,6 +224,7 @@ { /** * @builtin float::pow + * @id float--pow * @short power function * @description * Returns the value of f1 raised to the power of f2. Modified: trunk/core/libycp/src/YCPBuiltinList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinList.c… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinList.cc (original) +++ trunk/core/libycp/src/YCPBuiltinList.cc Fri Aug 8 15:36:02 2008 @@ -1097,7 +1097,7 @@ { /** * @builtin list::reduce - * @id list.reduce-internal + * @id list--reduce-internal * @short Reduces a list to a single value. * @param flex1 x * @param flex1 y @@ -1167,7 +1167,7 @@ { /** * @builtin list::reduce - * @id list.reduce-external + * @id list--reduce-external * @short Reduces a list to a single value. * @param flex1 x * @param flex2 y Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Aug 8 15:36:02 2008 @@ -3,6 +3,8 @@ - Re-added support to build libycp documentation in separate files additionally to combined.xml (needed for overall documentation). +- Dots in @ids for *::* builtins replaced with double dashes. +- Added @ids for *::* where missing (needed for docu). ------------------------------------------------------------------- Wed Jul 30 15:22:15 CEST 2008 - mvidner(a)suse.cz -- 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] r49872 - /trunk/core/libycp/src/YCPBuiltinString.cc
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 15:04:31 2008 New Revision: 49872 URL: http://svn.opensuse.org/viewcvs/yast?rev=49872&view=rev Log: Tiny doc fix Modified: trunk/core/libycp/src/YCPBuiltinString.cc Modified: trunk/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinString… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinString.cc (original) +++ trunk/core/libycp/src/YCPBuiltinString.cc Fri Aug 8 15:04:31 2008 @@ -514,7 +514,7 @@ * all characters that do not occur in <tt>CHARS</tt>. * * @see deletechars - * @usage filterchars ("a", "abcdefghijklmnopqrstuvwxyz") -> "ac" + * @usage filterchars ("a", "abcdefghijklmnopqrstuvwxyz") -> "a" * @usage filterchars ("abc","cde") -> "c" */ -- 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] r49871 - in /trunk/storage: VERSION package/yast2-storage.changes
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 15:02:10 2008 New Revision: 49871 URL: http://svn.opensuse.org/viewcvs/yast?rev=49871&view=rev Log: - new version for autobuild Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49871&r1=498… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Aug 8 15:02:10 2008 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Aug 8 15:02:10 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 08 15:01:11 CEST 2008 - aschnell(a)suse.de + +- integrated redesigned expert partitioner into installation + workflow +- version 2.17.13 + +------------------------------------------------------------------- Wed Aug 06 17:02:27 CEST 2008 - aschnell(a)suse.de - do not try to show /var/log/messages during installation -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49870 - in /trunk/core: libycp/doc/Makefile.am package/yast2-core.changes
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 14:57:50 2008 New Revision: 49870 URL: http://svn.opensuse.org/viewcvs/yast?rev=49870&view=rev Log: - Re-added support to build libycp documentation in separate files additionally to combined.xml (needed for overall documentation). Modified: trunk/core/libycp/doc/Makefile.am trunk/core/package/yast2-core.changes Modified: trunk/core/libycp/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/doc/Makefile.am?rev=… ============================================================================== --- trunk/core/libycp/doc/Makefile.am (original) +++ trunk/core/libycp/doc/Makefile.am Fri Aug 8 14:57:50 2008 @@ -6,7 +6,10 @@ htmldir = $(yastdocdir)/ycp builtin = $(wildcard $(srcdir)/../src/YCPBuiltin*.cc) +builtinxml := $(builtin:%.cc=%.xml) xmlfiles = combined.xml +# needed for building the overall documentation +xmlfilesseparated := $(foreach xml,$(builtinxml),$(notdir $(xml))) htmlfiles = $(wildcard html/*.html html/*/*.html) @@ -15,24 +18,31 @@ html/index.html \ $(htmlfiles) -html/index.html: $(xmlfiles) builtins.xml +html/index.html: $(xmlfilesseparated) $(xmlfiles) builtins.xml XML_CATALOG_FILES=@XML_CATALOG@ $(XSLTPROC) $(XSLTPROC_FLAGS) --xinclude @STYLESHEET_HTML@ builtins.xml YDOC := $(shell pkg-config --variable=ybindir yast2-devtools)/ydoc2 RENT := $(shell pkg-config --variable=ybindir yast2-devtools)/replace_entities + $(xmlfiles) : $(builtin) $(YDOC) -o $@.tmp $^ $(XSLTPROC) --stringparam disambiguate yes $(XSLTPROC_FLAGS) @STYLESHEET_YDOC@ $@.tmp > $@ $(RENT) $@ rm $@.tmp +$(xmlfilesseparated) : $(builtin) + $(YDOC) -o $@.tmp ../src/$(subst xml,cc,$@) + $(XSLTPROC) $(XSLTPROC_FLAGS) @STYLESHEET_YDOC@ $@.tmp > $@ + $(RENT) $@ + rm $@.tmp + html/yast2docs.css: html/index.html cp @STYLESHEET_CSS@ html cp -a `pkg-config --variable=yast2dir yast2-devtools`/data/docbook/images html EXTRA_DIST = builtins.xml -CLEANFILES = $(xmlfiles) +CLEANFILES = $(xmlfiles) $(xmlfilesseparated) clean-local: rm -rf html Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Aug 8 14:57:50 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 8 14:56:07 CEST 2008 - locilka(a)suse.cz + +- Re-added support to build libycp documentation in separate files + additionally to combined.xml (needed for overall documentation). + +------------------------------------------------------------------- Wed Jul 30 15:22:15 CEST 2008 - mvidner(a)suse.cz - Moved documentation around and adjusted it to conform with -- 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] r49869 - in /trunk/storage/libstorage/src: Dasd.cc StorageDefines.h
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 14:57:40 2008 New Revision: 49869 URL: http://svn.opensuse.org/viewcvs/yast?rev=49869&view=rev Log: - shell quoting Modified: trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/StorageDefines.h 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 Fri Aug 8 14:57:40 2008 @@ -15,6 +15,7 @@ #include "y2storage/Storage.h" #include "y2storage/OutputProcessor.h" #include "y2storage/Dasd.h" +#include "y2storage/StorageDefines.h" using namespace std; using namespace storage; @@ -35,7 +36,7 @@ bool Dasd::detectPartitionsFdasd( ProcPart& ppart ) { bool ret = true; - string cmd_line = "/sbin/fdasd -p " + quote(device()); + string cmd_line = FDASDBIN " -p " + quote(device()); system_stderr.erase(); y2milestone( "executing cmd:%s", cmd_line.c_str() ); SystemCmd Cmd( cmd_line ); @@ -49,7 +50,7 @@ bool Dasd::detectPartitions( ProcPart& ppart ) { bool ret = true; - string cmd_line = "dasdview -x " + quote(device()); + string cmd_line = DASDVIEWBIN " -x " + quote(device()); system_stderr.erase(); detected_label = "dasd"; setLabelData( "dasd" ); @@ -381,7 +382,7 @@ ++i; } inpfile.close(); - string cmd_line = "/sbin/fdasd -c " + inpname + " " + quote(device()); + string cmd_line = FDASDBIN " -c " + inpname + " " + quote(device()); if( execCheckFailed( cmd_line ) ) { SystemCmd cmd( "cat " + inpname ); @@ -551,8 +552,7 @@ normalizeDevice(*i); *i = "-f " + *i; } - string cmd_line = "dasdfmt -Y -P 4 -b 4096 -y -m 1 -d cdl " + - mergeString(devs); + string cmd_line = DASDFMTBIN " -Y -P 4 -b 4096 -y -m 1 -d cdl " + quote(devs); y2milestone( "cmdline:%s", cmd_line.c_str() ); CallbackProgressBar cb = getStorage()->getCallbackProgressBarTheOne(); ScrollBarHandler* sb = new DasdfmtScrollbar( cb ); @@ -647,6 +647,3 @@ return( s ); } } - - - Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDe… ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Fri Aug 8 14:57:40 2008 @@ -38,5 +38,9 @@ #define DDBIN "/bin/dd" +#define DASDFMTBIN "/sbin/dasdfmt" +#define DASDVIEWBIN "/sbin/dasdview" +#define FDASDBIN "/sbin/fdasd" + #endif -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49868 - in /branches/SuSE-Linux-11_0-Branch/installation: package/yast2-installation.changes startup/YaST2.call
by coolo＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: coolo Date: Fri Aug 8 14:54:30 2008 New Revision: 49868 URL: http://svn.opensuse.org/viewcvs/yast?rev=49868&view=rev Log: stop patching the X11 config in firstboot setups Modified: branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes branches/SuSE-Linux-11_0-Branch/installation/startup/YaST2.call Modified: branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/instal… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes Fri Aug 8 14:54:30 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 8 14:53:59 CEST 2008 - coolo(a)suse.de + +- fix path to reconfig_system + +------------------------------------------------------------------- Tue Jun 3 15:11:15 CEST 2008 - locilka(a)suse.cz - Always use --numeric-owner (always use numbers for user/group Modified: branches/SuSE-Linux-11_0-Branch/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/instal… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/installation/startup/YaST2.call (original) +++ branches/SuSE-Linux-11_0-Branch/installation/startup/YaST2.call Fri Aug 8 14:54:30 2008 @@ -193,7 +193,7 @@ #============================================= # patch X11 conf. if not update/continue mode #--------------------------------------------- - if [ ! -f /etc/reconfig_system ];then + if [ ! -f /var/lib/YaST2/reconfig_system ];then if [ ! -f /var/lib/YaST2/runme_at_boot ];then if [ ! -f /etc/X11/xorg.conf.instorig ];then # create backup copy... -- 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] r49867 - in /trunk/storage/libstorage/src: Dm.cc Regex.cc
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 14:11:26 2008 New Revision: 49867 URL: http://svn.opensuse.org/viewcvs/yast?rev=49867&view=rev Log: - avoid real tabs in source code Modified: trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/Regex.cc 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 Fri Aug 8 14:11:26 2008 @@ -433,13 +433,13 @@ c.execute(DMSETUPBIN " version"); if( c.retcode()!=0 ) { - c.execute(" grep \"^dm[-_]mod[ ]\" /proc/modules" ); + c.execute("grep \"^dm[-_]mod[ \t]\" /proc/modules"); if( c.numLines()<=0 ) - c.execute( "modprobe dm-mod" ); - c.execute(" grep \"^dm[-_]snapshot[ ]\" /proc/modules" ); + c.execute("modprobe dm-mod"); + c.execute("grep \"^dm[-_]snapshot[ \t]\" /proc/modules"); if( c.numLines()<=0 ) - c.execute( "modprobe dm-snapshot" ); - c.execute( "/sbin/devmap_mknod.sh" ); + c.execute("modprobe dm-snapshot"); + c.execute("/sbin/devmap_mknod.sh"); } } else Modified: trunk/storage/libstorage/src/Regex.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Regex.cc?… ============================================================================== --- trunk/storage/libstorage/src/Regex.cc (original) +++ trunk/storage/libstorage/src/Regex.cc Fri Aug 8 14:11:26 2008 @@ -78,5 +78,5 @@ return ""; } -const string& Regex::ws = "[ ]*"; +const string& Regex::ws = "[ \t]*"; const string& Regex::number = "[0123456789]+"; -- 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] r49866 - /trunk/doc/_build-www.sh
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 13:29:19 2008 New Revision: 49866 URL: http://svn.opensuse.org/viewcvs/yast?rev=49866&view=rev Log: make clean sounds better Modified: trunk/doc/_build-www.sh Modified: trunk/doc/_build-www.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/_build-www.sh?rev=49866&r1=4… ============================================================================== --- trunk/doc/_build-www.sh (original) +++ trunk/doc/_build-www.sh Fri Aug 8 13:29:19 2008 @@ -197,8 +197,8 @@ cd ${SRCDIR} cd core/libycp/doc echo "| Current directory: "`pwd` -rm -rf html make clean >> ${BUILDLOG} 2>>${BUILDLOG} +rm -rf html make ${MAKE_PARAMS} >> ${BUILDLOG} 2>>${BUILDLOG} || (echo "5 exiting..." && exit 42) checkforerrors -- 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] r49865 - /tags/stable-2_17_10/yast2/
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 13:19:55 2008 New Revision: 49865 URL: http://svn.opensuse.org/viewcvs/yast?rev=49865&view=rev Log: Created tag stable-2_17_10 for yast2 Added: tags/stable-2_17_10/yast2/ - copied from r49864, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49864 - in /trunk/yast2: library/wizard/src/Progress.ycp package/yast2.changes
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 13:19:43 2008 New Revision: 49864 URL: http://svn.opensuse.org/viewcvs/yast?rev=49864&view=rev Log: - Fixed the latest Progress patch to pass the testsuite. Modified: trunk/yast2/library/wizard/src/Progress.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/wizard/src/Progress.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Progres… ============================================================================== --- trunk/yast2/library/wizard/src/Progress.ycp (original) +++ trunk/yast2/library/wizard/src/Progress.ycp Fri Aug 8 13:19:43 2008 @@ -490,7 +490,7 @@ } // patch from Michal Srb https://bugzilla.novell.com/show_bug.cgi?id=406890#c7 - if (UI::WidgetExists (`id (`contents))) UI::ReplaceWidget (`id (`contents), bar); + if (! Mode::test() && UI::WidgetExists (`id (`contents))) UI::ReplaceWidget (`id (`contents), bar); if (! UI::WizardCommand(`SetDialogHeading( window_title ) ) ) { 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 Fri Aug 8 13:19:43 2008 @@ -1,8 +1,13 @@ ------------------------------------------------------------------- +Fri Aug 8 13:19:03 CEST 2008 - locilka(a)suse.cz + +- Fixed the latest Progress patch to pass the testsuite. +- 2.17.10 + +------------------------------------------------------------------- Fri Aug 8 10:28:38 CEST 2008 - jsuchome(a)suse.cz - anyxml agent documentation added to anyxml.scr (bnc#405291) -- 2.17.10 ------------------------------------------------------------------- Wed Aug 6 14:23:14 CEST 2008 - tgoettlicher(a)suse.de -- 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] r49863 - in /trunk/yast2: VERSION package/yast2.changes
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 13:15:39 2008 New Revision: 49863 URL: http://svn.opensuse.org/viewcvs/yast?rev=49863&view=rev Log: version Modified: trunk/yast2/VERSION trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=49863&r1=49862… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Aug 8 13:15:39 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 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 Fri Aug 8 13:15:39 2008 @@ -2,6 +2,7 @@ Fri Aug 8 10:28:38 CEST 2008 - jsuchome(a)suse.cz - anyxml agent documentation added to anyxml.scr (bnc#405291) +- 2.17.10 ------------------------------------------------------------------- Wed Aug 6 14:23:14 CEST 2008 - tgoettlicher(a)suse.de -- 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] r49862 - in /trunk/devtools: package/yast2-devtools.changes ydoc/src/ydoc2
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 12:59:18 2008 New Revision: 49862 URL: http://svn.opensuse.org/viewcvs/yast?rev=49862&view=rev Log: - Fixed ydoc2 to generate builtin/widget description even if there is no empty line between description and the following tag (adding newlines between all known tags before parsing). Modified: trunk/devtools/package/yast2-devtools.changes trunk/devtools/ydoc/src/ydoc2 Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Fri Aug 8 12:59:18 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 8 12:57:22 CEST 2008 - locilka(a)suse.cz + +- Fixed ydoc2 to generate builtin/widget description even if there + is no empty line between description and the following tag + (adding newlines between all known tags before parsing). + +------------------------------------------------------------------- Mon Aug 4 14:55:49 CEST 2008 - locilka(a)suse.cz - Generating better XML (Authors section) to be easier-to-process Modified: trunk/devtools/ydoc/src/ydoc2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/ydoc/src/ydoc2?rev=4986… ============================================================================== --- trunk/devtools/ydoc/src/ydoc2 (original) +++ trunk/devtools/ydoc/src/ydoc2 Fri Aug 8 12:59:18 2008 @@ -192,7 +192,19 @@ my ($pre, $post); - foreach my $line (@comments) + # add newlines before all tags + # multiline tags then can be proceeded one by one + # even more descriptions or examples can be supported + my @new_comments = (); + foreach my $line (@comments) { + if ($line =~ /^[ \t]*\@(note|description|example|examples|arg|optarg|param|builtin|widget|widgets|return|returns|id|since|class|short|usage|deprecated)( |\t|$)/) { + push @new_comments, "\n"; + } + push @new_comments, $line; + } + push @new_comments, "\n"; + + foreach my $line (@new_comments) { my $empty_line = $line; $empty_line =~ s/\s+//; @@ -206,7 +218,7 @@ { $keepformat = 0; } - + if($line =~ /\(a)(param|arg)\s+(.*)/o) { $lastwas = "param"; @@ -389,6 +401,8 @@ $entry->{"deprecated"} .= "magicnumber"; } } + + # continues on next line elsif($lastwas eq "optargs") { $lastwas = "optargs"; @@ -542,7 +556,6 @@ } elsif($lastwas eq "note") { - $lastwas = "note"; if ($empty_line eq "") { if ($para ne "") @@ -568,7 +581,6 @@ } elsif($lastwas eq "short" || $lastwas eq "description") { - $lastwas = "description"; if ($empty_line eq "") { if ($para ne "") @@ -601,8 +613,6 @@ } } - - push @{$entry->{"description"}}, @description; push @{$entry->{"note"}}, @note; push @{$entry->{"examples"}}, @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] r49861 - /branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp
by lslezak＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: lslezak Date: Fri Aug 8 12:56:56 2008 New Revision: 49861 URL: http://svn.opensuse.org/viewcvs/yast?rev=49861&view=rev Log: - refresh the selected sources and check chitectures after pressing [Next] in the source selection dialog Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Fri Aug 8 12:56:56 2008 @@ -579,12 +579,6 @@ { // change the architecture ProductCreator::SetPackageArch(new_arch); - - // initialize the target, read trusted GPG keys (needed for refresh) - Pkg::TargetInit("/", true); - Pkg::SourceForceRefreshNow(SrcID); - // finish the target - Pkg::TargetFinish(); return true; } } @@ -759,15 +753,63 @@ string arch = ProductCreator::GetPackageArch() ; - if (arch != nil && arch != Arch::architecture()) + if (arch != nil) { y2milestone("Target architecture has been changed"); ProductCreator::Config["arch"] = arch; - // TODO: check archs onece again (needed after switching architecture multiple times) + boolean check_ok = true; + boolean arch_changed = false; + + do + { + string ar = ProductCreator::GetPackageArch(); + check_ok = true; + arch_changed = false; + + // all selected sources should be refreshed + // check archs onece again (needed after switching architecture multiple times) + foreach(integer src, selected_items, + { + if (!CheckArchitecture(src)) + { + check_ok = false; + break; + } + + arch_changed = arch_changed || (ar != ProductCreator::GetPackageArch()); + } + ); + } + while(arch_changed); + + if (!check_ok) + { + // error message + Report::Error(_("There is a mismatch between the selected +repositories and the machine architecture. +Either select another repositories or +change the target architecture.")); + + // don't leave the dialog + continue; + } + + // temporarily initialize the target, read trusted GPG keys (needed for refresh) + Pkg::TargetInit("/", false); + + foreach(integer src, selected_items, + { + Pkg::SourceForceRefreshNow(src); + } + ); + // reload repositories Pkg::SourceFinishAll(); Pkg::SourceStartManager(false); + + // finish the target + Pkg::TargetFinish(); } going_back = false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49860 - in /trunk/storage/libstorage/src: LvmVg.cc StorageDefines.h
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 11:45:36 2008 New Revision: 49860 URL: http://svn.opensuse.org/viewcvs/yast?rev=49860&view=rev Log: - absolute paths Modified: trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/StorageDefines.h 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 Fri Aug 8 11:45:36 2008 @@ -944,12 +944,12 @@ if( val ) { Dm::activate(true); - c.execute( "vgscan --mknodes" ); - c.execute( "vgchange -a y" ); + c.execute(VGSCANBIN " --mknodes"); + c.execute(VGCHANGEBIN " -a y"); } else { - c.execute( "vgchange -a n" ); + c.execute(VGCHANGEBIN " -a n"); } active = val; } Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDe… ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Fri Aug 8 11:45:36 2008 @@ -21,6 +21,8 @@ #define VGEXTENDBIN "/sbin/vgextend" #define VGREDUCEBIN "/sbin/vgreduce" #define VGDISPLAYBIN "/sbin/vgdisplay" +#define VGSCANBIN "/sbin/vgscan" +#define VGCHANGEBIN "/sbin/vgchange" #define CRYPTSETUPBIN "/sbin/cryptsetup" #define LOSETUPBIN "/sbin/losetup" -- 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] r49859 - /trunk/storage/data/sysconfig.storage
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 11:32:35 2008 New Revision: 49859 URL: http://svn.opensuse.org/viewcvs/yast?rev=49859&view=rev Log: - EXPERT_DETAIL are history Modified: trunk/storage/data/sysconfig.storage Modified: trunk/storage/data/sysconfig.storage URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/data/sysconfig.storage?r… ============================================================================== --- trunk/storage/data/sysconfig.storage (original) +++ trunk/storage/data/sysconfig.storage Fri Aug 8 11:32:35 2008 @@ -1,9 +1,5 @@ ## Path: System/Yast2/Storage -## Type: integer(0:1) -# Setting for detailed view in expert partitioner. -EXPERT_DETAIL="" - ## Type: string # List of used filesystem types. USED_FS_LIST="" -- 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] r49858 - /trunk/storage/storage/src/include/ep-main.ycp
by aschnell＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: aschnell Date: Fri Aug 8 10:52:33 2008 New Revision: 49858 URL: http://svn.opensuse.org/viewcvs/yast?rev=49858&view=rev Log: - set PartMode Modified: trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Fri Aug 8 10:52:33 2008 @@ -61,7 +61,7 @@ UI::ChangeWidget(`id(`table), `CurrentItem, device); } - + include "partitioning/icons.ycp"; include "partitioning/ep-lib.ycp"; @@ -318,15 +318,29 @@ TreePanel::Destroy(); - if (widget == `back || widget == `abort) - { - Storage::RestoreTargetBackup("expert-partitioner"); - } - else + switch (widget) { - Storage::DisposeTargetBackup("expert-partitioner"); + case `back: + case `abort: + + if (Storage::GetPartMode() == "NORMAL") + Storage::SetPartMode("CUSTOM"); + + break; + + case `next: + + if (!Storage::EqualBackupStates("expert-partitioner", "", true)) + { + Storage::SetPartMode("CUSTOM"); + Storage::UpdateChangeTime(); + } + + break; } + Storage::DisposeTargetBackup("expert-partitioner"); + return widget; } } -- 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] r49857 - /tags/stable-2_17_1/nfs-client/
by kmachalkova＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: kmachalkova Date: Fri Aug 8 10:35:46 2008 New Revision: 49857 URL: http://svn.opensuse.org/viewcvs/yast?rev=49857&view=rev Log: Created tag stable-2_17_1 for nfs-client Added: tags/stable-2_17_1/nfs-client/ - copied from r49856, trunk/nfs-client/ -- 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] r49856 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes
by kmachalkova＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: kmachalkova Date: Fri Aug 8 10:35:35 2008 New Revision: 49856 URL: http://svn.opensuse.org/viewcvs/yast?rev=49856&view=rev Log: 2.17.1 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=49856&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Fri Aug 8 10:35:35 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Fri Aug 8 10:35:35 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 8 10:29:55 CEST 2008 - kmachalkova(a)suse.cz + +- Configuration dialog split into two tabs: fstab entries and settings +- Extended list of supported nfs(4) mount options +- 2.17.1 + +------------------------------------------------------------------- Wed Aug 6 15:25:16 CEST 2008 - kmachalkova(a)suse.cz - Create correct fstab entries when importing data from AY profile -- 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] r49855 - in /trunk/yast2: library/agents/anyxml.scr package/yast2.changes
by jsuchome＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: jsuchome Date: Fri Aug 8 10:33:06 2008 New Revision: 49855 URL: http://svn.opensuse.org/viewcvs/yast?rev=49855&view=rev Log: - anyxml agent documentation added to anyxml.scr (bnc#405291) Modified: trunk/yast2/library/agents/anyxml.scr trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/agents/anyxml.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/agents/anyxml.scr?… ============================================================================== --- trunk/yast2/library/agents/anyxml.scr (original) +++ trunk/yast2/library/agents/anyxml.scr Fri Aug 8 10:33:06 2008 @@ -1,13 +1,66 @@ /** * File: anyxml.scr * - * Summary: Agent for reading any XML files. + * Summary: Agent for reading and writing simple XML files. + + * Description: Agent is using Perl XML::Simple library. + * Write access is supported, but check the limitations + * at XML-Simple page (e.g. order of elements is lost in the + * maps) * * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * Example: SCR::Read (.anyxml, "/root/some_file.xml") + * See: http://search.cpan.org/dist/XML-Simple/lib/XML/Simple.pm + * + * Example: + * + * Read a file /tmp/in.xml into YCP map: + * + * map config = (map)SCR::Read (.anyxml, "/tmp/in.xml") + * + * Using the agent this way, these default options of XML::Simple library + * will be used for reading: + * + * ForceContent => 1 + * ForceArray => 1 + * KeepRoot => 1, + * KeyAttr => [], + * + * Find the description of these arguments in the XML::Simple documentaion. + * For example, ForceArray set to 1 "forces nested elements to be represented + * as arrays even when there is only one". + * + * Alternative way of reading is using the argument map. This way it is + * possible to specify non-default read options in the "args" submap: + * + * map config = (map)SCR::Read (.anyxml, $[ + * "file" : "/tmp/in.xml", + * "args" : $[ + * "ForceArray" : 0, + * "KeepRoot" : 1 + * ] + * ]) + * + * Example: + * + * Writing with the default options: + * + * Write (.anyxml, $[ + * "file" : "/tmp/config.xml", + * "xml" : config, + * ]) + * + * Non-default write options could be used by passing extra submap with + * "args" key in the write map: * - * $Id:$ + * Write (.anyxml, $[ + * "file" : "c.xml", + * "xml" : config, + * "args : $[ + * "XMLDecl" : <?xml version="123456789"?>, + * "RootName" : "test" + * ] + * ]); */ .anyxml 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 Fri Aug 8 10:33:06 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 8 10:28:38 CEST 2008 - jsuchome(a)suse.cz + +- anyxml agent documentation added to anyxml.scr (bnc#405291) + +------------------------------------------------------------------- Wed Aug 6 14:23:14 CEST 2008 - tgoettlicher(a)suse.de - Fixed bnc #413516: HideBackButton() always hides back button -- 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] r49854 - /trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc
by mlandres＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: mlandres Date: Fri Aug 8 10:30:59 2008 New Revision: 49854 URL: http://svn.opensuse.org/viewcvs/yast?rev=49854&view=rev Log: dead code removed Modified: trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc Modified: trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStatusStrat… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc (original) +++ trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc Fri Aug 8 10:30:59 2008 @@ -280,18 +280,7 @@ void NCPkgStatusStrategy::solveResolvableCollections() { zypp::Resolver_Ptr resolver = zypp::getZYpp()->resolver(); - // transactReskind() is obsolete -> use resolvePool() resolver->resolvePool(); - -#if 0 - resolver->transactReset( zypp::ResStatus::APPL_LOW ); - - resolver->transactResKind( zypp::ResTraits<zypp::Product>::kind ); - resolver->transactResKind( zypp::ResTraits<zypp::Selection>::kind ); - resolver->transactResKind( zypp::ResTraits<zypp::Pattern >::kind ); - resolver->transactResKind( zypp::ResTraits<zypp::Language >::kind ); - resolver->transactResKind( zypp::ResTraits<zypp::Patch >::kind ); -#endif } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49853 - /tags/stable-2_17_3/installation/
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 10:26:57 2008 New Revision: 49853 URL: http://svn.opensuse.org/viewcvs/yast?rev=49853&view=rev Log: Created tag stable-2_17_3 for installation Added: tags/stable-2_17_3/installation/ - copied from r49852, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49852 - in /trunk/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: locilka Date: Fri Aug 8 10:26:48 2008 New Revision: 49852 URL: http://svn.opensuse.org/viewcvs/yast?rev=49852&view=rev Log: version Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=49852&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Aug 8 10:26:48 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 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 Fri Aug 8 10:26:48 2008 @@ -6,6 +6,7 @@ - Configuration for inst_scenarios is defined in control file (Only SLES so far), client added into SLES workflow. - Extended control file documentation (All FATE #304373). +- 2.17.3 ------------------------------------------------------------------- Wed Aug 6 13:54:07 CEST 2008 - locilka(a)suse.cz -- 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] r49851 - /trunk/qt-pkg/src/YQPkgSearchFilterView.cc
by mlandres＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: mlandres Date: Fri Aug 8 10:24:45 2008 New Revision: 49851 URL: http://svn.opensuse.org/viewcvs/yast?rev=49851&view=rev Log: replace ResTraits<>::kind by ResKind Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView… ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Fri Aug 8 10:24:45 2008 @@ -213,7 +213,7 @@ zypp::PoolQuery query; - query.addKind(zypp::ResTraits<zypp::Package>::kind); + query.addKind(zypp::ResKind::package); string searchtext = _searchText->currentText().toUtf8().data(); -- 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] r49850 - /trunk/samba-server/src/SambaBackendLDAP.pm
by jsuchome＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: jsuchome Date: Fri Aug 8 10:10:50 2008 New Revision: 49850 URL: http://svn.opensuse.org/viewcvs/yast?rev=49850&view=rev Log: some more fixes of LDAP object names Modified: trunk/samba-server/src/SambaBackendLDAP.pm Modified: trunk/samba-server/src/SambaBackendLDAP.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/SambaBackendLDA… ============================================================================== --- trunk/samba-server/src/SambaBackendLDAP.pm (original) +++ trunk/samba-server/src/SambaBackendLDAP.pm Fri Aug 8 10:10:50 2008 @@ -326,8 +326,8 @@ y2milestone("Creating dn: $dn"); my $map; given($attr) { - when ("dc") {$map = {objectClass => ["top", "dcobject"], dc => $value}} - when ("ou") {$map = {objectClass => ["top", "organizationalunit"], ou => $value}} + when ("dc") {$map = {objectClass => ["top", "dcObject"], dc => $value}} + when ("ou") {$map = {objectClass => ["top", "organizationalUnit"], ou => $value}} # translators: error message, followed by class giving error default {return __("Unknown Class:")." $dn\n".__("Only dcObject (dc) and organizationalUnit (ou) classes are supported.")} }; -- 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] r49849 - /tags/stable-2_17_4/online-update/
by jsuchome＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: jsuchome Date: Fri Aug 8 09:00:09 2008 New Revision: 49849 URL: http://svn.opensuse.org/viewcvs/yast?rev=49849&view=rev Log: Created tag stable-2_17_4 for online-update Added: tags/stable-2_17_4/online-update/ - copied from r49848, trunk/online-update/ -- 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] r49848 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/OnlineUpdateDialogs.ycp
by jsuchome＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: jsuchome Date: Fri Aug 8 08:59:52 2008 New Revision: 49848 URL: http://svn.opensuse.org/viewcvs/yast?rev=49848&view=rev Log: - button labels adapted to current style guide (#bnc398480) - 2.17.4 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/OnlineUpdateDialogs.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=49848&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Fri Aug 8 08:59:52 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Fri Aug 8 08:59:52 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 8 08:56:09 CEST 2008 - jsuchome(a)suse.cz + +- button labels adapted to current style guide (#bnc398480) +- 2.17.4 + +------------------------------------------------------------------- Tue Jul 8 13:00:19 CEST 2008 - jsuchome(a)suse.cz - Run online update during autoinstallation (fate#301298) Modified: trunk/online-update/src/OnlineUpdateDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/OnlineUpdateDi… ============================================================================== --- trunk/online-update/src/OnlineUpdateDialogs.ycp (original) +++ trunk/online-update/src/OnlineUpdateDialogs.ycp Fri Aug 8 08:59:52 2008 @@ -71,7 +71,7 @@ term content = `VBox( `HBox( - `HSpacing( 0.8 ), + `HSpacing (), `Left( `CheckBox( `id( `enable ), `opt( `notify ), // checkbox label @@ -80,7 +80,7 @@ ), `VSpacing( 0.2 ), `HBox( - `HSpacing( 0.8 ), + `HSpacing (), `Left( `Frame( `id( `settings ), "", `VBox( `HBox( @@ -148,10 +148,9 @@ ); term dlg_contents = `HVCenter( content); - Wizard::CreateDialog(); + Wizard::OpenOKDialog (); Wizard::SetDesktopIcon("online_update"); - Wizard::SetContentsButtons(heading, dlg_contents, txt, - Label::BackButton(), Label::FinishButton()); + Wizard::SetContents (heading, dlg_contents, txt, true, true); UI::ChangeWidget( `id( `skipPre ), `Enabled, enabled ); -- 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] r49847 - /tags/stable-2_17_1/profile-manager/
by jsuchome＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: jsuchome Date: Fri Aug 8 08:54:05 2008 New Revision: 49847 URL: http://svn.opensuse.org/viewcvs/yast?rev=49847&view=rev Log: Created tag stable-2_17_1 for profile-manager Added: tags/stable-2_17_1/profile-manager/ - copied from r49846, trunk/profile-manager/ -- 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] r49846 - in /trunk/profile-manager: VERSION package/yast2-profile-manager.changes src/complex.ycp
by jsuchome＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: jsuchome Date: Fri Aug 8 08:54:02 2008 New Revision: 49846 URL: http://svn.opensuse.org/viewcvs/yast?rev=49846&view=rev Log: - button labels adapted to current style guide (bnc#398500) - 2.17.1 Modified: trunk/profile-manager/VERSION trunk/profile-manager/package/yast2-profile-manager.changes trunk/profile-manager/src/complex.ycp Modified: trunk/profile-manager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/VERSION?rev=4984… ============================================================================== --- trunk/profile-manager/VERSION (original) +++ trunk/profile-manager/VERSION Fri Aug 8 08:54:02 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/package/yast2-pr… ============================================================================== --- trunk/profile-manager/package/yast2-profile-manager.changes (original) +++ trunk/profile-manager/package/yast2-profile-manager.changes Fri Aug 8 08:54:02 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 8 08:48:16 CEST 2008 - jsuchome(a)suse.cz + +- button labels adapted to current style guide (bnc#398500) +- 2.17.1 + +------------------------------------------------------------------- Fri Jun 6 15:17:47 CEST 2008 - jsuchome(a)suse.cz - do not show back button in main dialog (bnc#390098) Modified: trunk/profile-manager/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/complex.ycp?… ============================================================================== --- trunk/profile-manager/src/complex.ycp (original) +++ trunk/profile-manager/src/complex.ycp Fri Aug 8 08:54:02 2008 @@ -126,7 +126,7 @@ `HSpacing(3)); Wizard::SetContentsButtons (caption, contents, HELPS["main"]:"", - Label::AbortButton (), Label::FinishButton ()); + Label::CancelButton(), Label::OKButton()); if (ProfileManager::enabled) { -- 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] r49845 - /tags/stable-2_17_0/live-installer/
by jsrain＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: jsrain Date: Fri Aug 8 08:25:40 2008 New Revision: 49845 URL: http://svn.opensuse.org/viewcvs/yast?rev=49845&view=rev Log: Created tag stable-2_17_0 for live-installer Added: tags/stable-2_17_0/live-installer/ - copied from r49844, trunk/live-installer/ -- 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] r49844 - /trunk/live-installer/configure.in.in
by jsrain＠svn.opensuse.org 08 Aug '08

08 Aug '08

Author: jsrain Date: Fri Aug 8 08:20:38 2008 New Revision: 49844 URL: http://svn.opensuse.org/viewcvs/yast?rev=49844&view=rev Log: control file had been removed, remove also the relic in configure.in.in Modified: trunk/live-installer/configure.in.in Modified: trunk/live-installer/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/configure.in.in?r… ============================================================================== --- trunk/live-installer/configure.in.in (original) +++ trunk/live-installer/configure.in.in Fri Aug 8 08:20:38 2008 @@ -9,9 +9,5 @@ @YAST2-CHECKS-YCP@ @YAST2-CHECKS-TESTSUITE@ -## Nasty hack: xgettext doesn't work for XML files, so let's symlink it -( cd src/control; ln -sf live-install.xml live-install.glade ) -find src/control -name \*.glade | LC_ALL=C sort > POTFILES - ## and generate the output... @YAST2-OUTPUT@ -- 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] r49843 - in /trunk/storage/libstorage/src: Disk.cc StorageDefines.h
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 22:47:49 2008 New Revision: 49843 URL: http://svn.opensuse.org/viewcvs/yast?rev=49843&view=rev Log: - shell quoting Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/StorageDefines.h 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 Thu Aug 7 22:47:49 2008 @@ -425,7 +425,7 @@ if( dlabel.empty() ) { Cmd.setCombine(); - Cmd.execute( "/sbin/fdisk -l " + device() ); + Cmd.execute(FDISKBIN " -l " + quote(device())); if( Cmd.select( "AIX label" )>0 ) { detected_label = "aix"; Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDe… ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Thu Aug 7 22:47:49 2008 @@ -5,6 +5,8 @@ #define PARTEDBIN "/usr/sbin/parted" #define PARTEDCMD PARTEDBIN " -s " // blank at end !! +#define FDISKBIN "/sbin/fdisk" + #define MDADMBIN "/sbin/mdadm" #define PVCREATEBIN "/sbin/pvcreate" -- 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] r49842 - in /trunk/storage/libstorage/src: Disk.cc Loop.cc LvmVg.cc MdCo.cc ProcMounts.cc StorageDefines.h Volume.cc
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 22:38:04 2008 New Revision: 49842 URL: http://svn.opensuse.org/viewcvs/yast?rev=49842&view=rev Log: - shell quoting Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Loop.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/ProcMounts.cc trunk/storage/libstorage/src/StorageDefines.h trunk/storage/libstorage/src/Volume.cc 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 Thu Aug 7 22:38:04 2008 @@ -2284,13 +2284,13 @@ { string cmd; SystemCmd c; - cmd = "dd if=/dev/zero of=" + quote(p->device()) + " bs=1k count=200"; + cmd = DDBIN " if=/dev/zero of=" + quote(p->device()) + " bs=1k count=200"; c.execute( cmd ); unsigned long long pos = p->sizeK(); if( pos>200 ) { pos -= 200; - cmd = "dd if=/dev/zero of=" + p->device() + + cmd = DDBIN " if=/dev/zero of=" + quote(p->device()) + " seek=" + decString(pos) + " bs=1k count=10"; c.execute( cmd ); } 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 Thu Aug 7 22:38:04 2008 @@ -13,6 +13,7 @@ #include "y2storage/ProcPart.h" #include "y2storage/Storage.h" #include "y2storage/SystemCmd.h" +#include "y2storage/StorageDefines.h" using namespace storage; using namespace std; @@ -182,7 +183,7 @@ y2mil( "pa:" << pa ); createPath( pa ); } - string cmd = "dd if=/dev/zero of=" + quote(lfileRealPath()); + string cmd = DDBIN " if=/dev/zero of=" + quote(lfileRealPath()); cmd += " bs=1k count=" + decString( sizeK() ); SystemCmd c( cmd ); ret = c.retcode()==0; 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 Thu Aug 7 22:38:04 2008 @@ -1344,7 +1344,7 @@ cmd = PARTEDCMD + quote(device) + " mklabel msdos"; c.execute( cmd ); } - cmd = "echo y | " PVCREATEBIN " -ff " + metaString() + device; + cmd = "echo y | " PVCREATEBIN " -ff " + metaString() + quote(device); c.execute( cmd ); if( c.retcode()!=0 ) { 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 Thu Aug 7 22:38:04 2008 @@ -629,9 +629,9 @@ { string cmd; SystemCmd c; - cmd = "dd if=/dev/zero of=" + quote(m->device()) + " bs=1k count=200"; + cmd = DDBIN " if=/dev/zero of=" + quote(m->device()) + " bs=1k count=200"; c.execute( cmd ); - cmd = "dd if=/dev/zero of=" + quote(m->device()) + + cmd = DDBIN " if=/dev/zero of=" + quote(m->device()) + " seek=" + decString(m->sizeK()-10) + " bs=1k count=10"; c.execute( cmd ); 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 Thu Aug 7 22:38:04 2008 @@ -10,6 +10,7 @@ #include "y2storage/ProcMounts.h" #include "y2storage/StorageTmpl.h" #include "y2storage/Storage.h" +#include "y2storage/StorageDefines.h" using namespace std; using namespace storage; @@ -23,7 +24,7 @@ ifstream mounts( "/proc/mounts" ); string line; getline( mounts, line ); - SystemCmd mt( "mount" ); + SystemCmd mt(MOUNTBIN); while( mounts.good() ) { string dev = extractNthWord( 0, line ); Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDe… ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Thu Aug 7 22:38:04 2008 @@ -32,5 +32,7 @@ #define SWAPONBIN "/sbin/swapon" #define SWAPOFFBIN "/sbin/swapoff" +#define DDBIN "/bin/dd" + #endif 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 Thu Aug 7 22:38:04 2008 @@ -691,7 +691,7 @@ (Storage::arch().find( "sparc" )!=0 || encryption!=ENC_NONE )) { SystemCmd c; - string cmd = "/bin/dd if="; + string cmd = DDBIN " if="; cmd += (encryption!=ENC_NONE) ? "/dev/urandom" : "/dev/zero"; cmd += " of=" + quote(mountDevice()) + " bs=1024 count="; cmd += decString(min(200ull,size_k)); -- 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] r49841 - in /trunk/gtk: ChangeLog src/ygtklinklabel.c
by rpmcruz＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: rpmcruz Date: Thu Aug 7 20:56:17 2008 New Revision: 49841 URL: http://svn.opensuse.org/viewcvs/yast?rev=49841&view=rev Log: * src/ygtklinklabel.c: small cosmetic fix. Modified: trunk/gtk/ChangeLog trunk/gtk/src/ygtklinklabel.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=49841&r1=49840… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Aug 7 20:56:17 2008 @@ -1,3 +1,7 @@ +2008-08-07 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtklinklabel.c: small cosmetic fix. + 2008-08-04 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGUtils.cc: convert_to_xhtml() bug fix: allow '=' to be used Modified: trunk/gtk/src/ygtklinklabel.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtklinklabel.c?rev=4984… ============================================================================== --- trunk/gtk/src/ygtklinklabel.c (original) +++ trunk/gtk/src/ygtklinklabel.c Thu Aug 7 20:56:17 2008 @@ -114,6 +114,8 @@ requisition->height = PANGO_PIXELS (ascent + descent); } +#define SPACING 4 + static void ygtk_link_label_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { @@ -130,9 +132,9 @@ pango_layout_get_extents (label->link_layout, NULL, &link_logical); gint link_width = link_logical.width / PANGO_SCALE; gint x; - width = width - link_logical.width + 4*PANGO_SCALE; + width = width - link_logical.width - SPACING*PANGO_SCALE; if (logical.width < width && label->link_always_visible) - x = allocation->x + logical.width/PANGO_SCALE + 4; + x = allocation->x + logical.width/PANGO_SCALE + SPACING; else x = allocation->x + (allocation->width - link_width); gdk_window_move_resize (label->link_window, x, -- 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] r49840 - /trunk/storage/storage/src/include/ep-main.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 20:37:40 2008 New Revision: 49840 URL: http://svn.opensuse.org/viewcvs/yast?rev=49840&view=rev Log: - make own Wizard for inst_prepdisk Modified: trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Thu Aug 7 20:37:40 2008 @@ -213,7 +213,11 @@ { StorageSettings::Save(); + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("disk"); symbol ret2 = (symbol) WFM::CallFunction("inst_prepdisk", [true, true]); + Wizard::CloseDialog(); + Storage::CreateTargetBackup("expert-partitioner"); if (ret2 != `next) @@ -298,13 +302,7 @@ if (Mode::normal()) { if (DoApply() == `back) - { - // DoApply (inst_prepdisk) replaces the wizard contents - // TODO: make nicer - Wizard::SetContentsButtons(_("Expert Partitioner"), contents, "", back_label, next_label); - UpdateNavigationTree(nil); widget = `again; - } } } } break; -- 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] r49839 - /trunk/storage/storage/src/inst_disk.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 20:23:07 2008 New Revision: 49839 URL: http://svn.opensuse.org/viewcvs/yast?rev=49839&view=rev Log: - use correct CloseDialog() Modified: trunk/storage/storage/src/inst_disk.ycp Modified: trunk/storage/storage/src/inst_disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk.yc… ============================================================================== --- trunk/storage/storage/src/inst_disk.ycp (original) +++ trunk/storage/storage/src/inst_disk.ycp Thu Aug 7 20:23:07 2008 @@ -63,7 +63,7 @@ if (handle_dialog) { - UI::CloseDialog(); + Wizard::CloseDialog(); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49838 - in /trunk/live-installer: VERSION package/yast2-live-installer.changes src/live-installer.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 18:39:01 2008 New Revision: 49838 URL: http://svn.opensuse.org/viewcvs/yast?rev=49838&view=rev Log: - adapted to changes in yast2-storage Modified: trunk/live-installer/VERSION trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/live-installer.ycp Modified: trunk/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/VERSION?rev=49838… ============================================================================== --- trunk/live-installer/VERSION (original) +++ trunk/live-installer/VERSION Thu Aug 7 18:39:01 2008 @@ -1 +1 @@ -2.16.5 +2.17.0 Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Thu Aug 7 18:39:01 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 07 18:38:07 CEST 2008 - aschnell(a)suse.de + +- adapted to changes in yast2-storage +- 2.17.0 + +------------------------------------------------------------------- Thu May 29 10:59:30 CEST 2008 - jsrain(a)suse.cz - call boot.dmraid start at the beginning of live installation Modified: trunk/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installe… ============================================================================== --- trunk/live-installer/src/live-installer.ycp (original) +++ trunk/live-installer/src/live-installer.ycp Thu Aug 7 18:39:01 2008 @@ -68,7 +68,7 @@ Mode::SetMode ("live_installation"); // Stage::initial is required for most of the modules to behave correctly Stage::Set ("initial"); - Storage::InitLibstorage (); + Storage::InitLibstorage (false); if (!ProductControl::Init()) y2error("control file %1 not found", ProductControl::custom_control_file ); -- 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] r49837 - in /trunk/storage/storage/src/include: ep-lvm-dialogs.ycp ep-lvm-lib.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 18:35:27 2008 New Revision: 49837 URL: http://svn.opensuse.org/viewcvs/yast?rev=49837&view=rev Log: - some MiniWorkflows need a commit before closing Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp trunk/storage/storage/src/include/ep-lvm-lib.ycp Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Thu Aug 7 18:35:27 2008 @@ -421,14 +421,16 @@ } - boolean DlgResizeVolumeGroup(map<string, any> &data) + boolean DlgResizeVolumeGroup(map<string, any> &data, symbol() Commit) { map<string, any> aliases = $[ - "TheOne" : ``(MiniWorkflowStepResizeVg(data)) + "TheOne" : ``(MiniWorkflowStepResizeVg(data)), + "Commit" : ``(Commit()) ]; map<string, any> sequence = $[ - "TheOne" : $[ `finish : `finish ] + "TheOne" : $[ `finish : "Commit" ], + "Commit" : $[ `finish : `finish ] ]; string title = sformat(_("Resize Volume Group %1"), data["device"]:"error"); @@ -490,22 +492,24 @@ } - boolean DlgCreateLogicalVolume(map<string, any> &data) + boolean DlgCreateLogicalVolume(map<string, any> &data, symbol() Commit) { map<string, any> aliases = $[ "Name" : ``(MiniWorkflowStepLvName(data)), "Size" : ``(MiniWorkflowStepLvSize(data)), "FormatMount" : ``(MiniWorkflowStepFormatMount(data)), - "Password" : ``(MiniWorkflowStepPassword(data)) + "Password" : ``(MiniWorkflowStepPassword(data)), + "Commit" : ``(Commit()) ]; map<string, any> sequence = $[ "Name" : $[ `next : "Size" ], "Size" : $[ `next : "FormatMount", - `finish : `finish ], + `finish : "Commit" ], "FormatMount" : $[ `next : "Password", - `finish : `finish ], - "Password" : $[ `finish : `finish ] + `finish : "Commit" ], + "Password" : $[ `finish : "Commit" ], + "Commit" : $[ `finish : `finish ] ]; string title = sformat(_("Add Logical Volume on %1"), "/dev/" + data["vg_name"]:"error"); @@ -542,7 +546,7 @@ void DlgResizeLogicalVolumeNew(map <string, any> &data) { //the empty map is here because data on whole disk need to be passed - //to resize dialog for partitions (to get available space etc.) + //to resize dialog for partitions (to get available space etc.) //for LVMs we probably don't need it) DlgResize(data, $[], `lv); } Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Thu Aug 7 18:35:27 2008 @@ -86,7 +86,8 @@ string vgname = data["name"]:"error"; - if (DlgResizeVolumeGroup(data)) + + symbol Commit() { Debug("resize vg from data", data); @@ -104,11 +105,21 @@ if (!RemovePvs(vgname, devices_removed)) { Error(_("Failed to remove some physical devices. TODO")); - } - UpdateNavigationTree(nil); - TreePanel::Create(); + // TODO: update data + + return `back; + } } + + return `finish; + } + + + if (DlgResizeVolumeGroup(data, Commit)) + { + UpdateNavigationTree(nil); + TreePanel::Create(); } } @@ -174,15 +185,23 @@ data["pesize"] = target_map[device, "pesize"]:0; data["max_size_k"] = (target_map[device, "pe_free"]:0 * target_map[device, "pesize"]:0) / 1024; - if (DlgCreateLogicalVolume(data)) - { - // ChangeVolumeProperties and thus addLogicalVolume need the device name + + symbol Commit() + { + // ChangeVolumeProperties and thus addLogicalVolume need the device data["device"] = device + "/" + data["name"]:""; Debug("create lv from data", data); - addLogicalVolume(data, substring(device, 5)); + if (!addLogicalVolume(data, substring(device, 5))) + return `back; + return `finish; + } + + + if (DlgCreateLogicalVolume(data, Commit)) + { UpdateNavigationTree(nil); TreePanel::Create(); UpdateTableFocus("/dev/" + data["vg_name"]:"error" + "/" + data["name"]:"error"); -- 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] r49836 - /trunk/storage/storage/src/include/ep-main.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 17:50:47 2008 New Revision: 49836 URL: http://svn.opensuse.org/viewcvs/yast?rev=49836&view=rev Log: - check partitioning setup Modified: trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Thu Aug 7 17:50:47 2008 @@ -29,10 +29,7 @@ include "partitioning/lvm_ui_dialogs.ycp"; - include "partitioning/lvm_pv_lib.ycp"; include "partitioning/raid_lib.ycp"; - include "partitioning/custom_part_lib.ycp"; - include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_check_generated.ycp"; @@ -271,7 +268,7 @@ switch (widget) { case `back: - case `abort: + case `abort: { if (!Storage::EqualBackupStates("expert-partitioner", "", true)) { // popup text %1 will be replaces with button text @@ -285,27 +282,38 @@ widget = `again; } } - break; + } break; + + case `next: { + list<any> retval = check_created_partition_table(Storage::GetTargetMap(), true, + Stage::initial() && !Mode::repair()); + Storage::SetTargetMap(retval[0]:$[]); - case `next: - if (Mode::normal()) + if (retval[1]:`next != `next) + { + widget = `again; + } + else { - if (DoApply() == `back) + if (Mode::normal()) { - // DoApply (inst_prepdisk) replaces the wizard contents - // TODO: make nicer - Wizard::SetContentsButtons(_("Expert Partitioner"), contents, "", back_label, next_label); - UpdateNavigationTree(nil); - widget = `again; + if (DoApply() == `back) + { + // DoApply (inst_prepdisk) replaces the wizard contents + // TODO: make nicer + Wizard::SetContentsButtons(_("Expert Partitioner"), contents, "", back_label, next_label); + UpdateNavigationTree(nil); + widget = `again; + } } } - break; + } break; - case `table: + case `table: { any citem = UI::QueryWidget(`id(`table), `CurrentItem); TreePanel::SwitchToNew(citem); UI::SetFocus(`tree); - break; + } break; } } until (widget == `back || widget == `abort || widget == `next); -- 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] r49835 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Package.cc src/Resolvable_Install.cc src/Resolvable_Properties.cc src/Selection.cc src/Source_Get.cc src/Target.cc
by mlandres＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: mlandres Date: Thu Aug 7 17:15:02 2008 New Revision: 49835 URL: http://svn.opensuse.org/viewcvs/yast?rev=49835&view=rev Log: - Adapt to new product handling. Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/Resolvable_Install.cc trunk/pkg-bindings/src/Resolvable_Properties.cc trunk/pkg-bindings/src/Selection.cc trunk/pkg-bindings/src/Source_Get.cc trunk/pkg-bindings/src/Target.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=49835&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Thu Aug 7 17:15:02 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Aug 7 17:15:02 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 7 17:13:38 CEST 2008 - ma(a)suse.de + +- Adapt to new product handling. +- 2.17.5 + +------------------------------------------------------------------- Tue Aug 5 14:55:43 CEST 2008 - lslezak(a)suse.cz - fixed searching for the candidate package - prefer better @@ -16,7 +22,7 @@ - allow priority >99 in Pkg::SourceSet() (bnc#402135) ------------------------------------------------------------------- -Wed Jul 23 16:12:56 CEST 2008 ma(a)suse.de +Wed Jul 23 16:12:56 CEST 2008 - ma(a)suse.de - Remove references to obsolete freshens dependencies. - 2.17.3 Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Thu Aug 7 17:15:02 2008 @@ -755,7 +755,7 @@ { if (tags->value(i)->isString()) { - DoProvideNameKind (tags->value(i)->asString()->value(), zypp::ResTraits<zypp::Package>::kind, zypp::ZConfig::instance().systemArchitecture(), ""); + DoProvideNameKind (tags->value(i)->asString()->value(), zypp::ResKind::package, zypp::ZConfig::instance().systemArchitecture(), ""); } else { @@ -796,7 +796,7 @@ { if (tags->value(i)->isString()) { - DoRemoveNameKind( tags->value(i)->asString()->value(), zypp::ResTraits<zypp::Package>::kind); + DoRemoveNameKind( tags->value(i)->asString()->value(), zypp::ResKind::package); } else { @@ -1323,8 +1323,8 @@ { try { - for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraits<zypp::Package>::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Package>::kind); + for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::package); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::package); ++it) { // return true if there is a package installed/removed by user @@ -1360,8 +1360,8 @@ try { - for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraits<zypp::Package>::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Package>::kind); + for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::package); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::package); ++it) { if (it->status().isToBeUninstalled()) @@ -1397,8 +1397,8 @@ try { - for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraits<zypp::Package>::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Package>::kind); + for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::package); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::package); ++it) { if (it->status().isToBeInstalled()) @@ -1466,8 +1466,8 @@ try { - for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraits<zypp::Package>::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Package>::kind); + for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::package); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::package); ++it) { // check status and causer @@ -1517,8 +1517,8 @@ try { - for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraits<zypp::Package>::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Package>::kind); + for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::package); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::package); ++it) { if (which == "installed") @@ -1726,7 +1726,7 @@ // ensure installation of the 'best' architecture - return YCPBoolean( DoProvideNameKind( name, zypp::ResTraits<zypp::Package>::kind, zypp::ZConfig::instance().systemArchitecture(), "") ); + return YCPBoolean( DoProvideNameKind( name, zypp::ResKind::package, zypp::ZConfig::instance().systemArchitecture(), "") ); } /** @@ -1746,7 +1746,7 @@ // ensure installation of the 'best' architecture - return YCPBoolean( DoProvideNameKind( name, zypp::ResTraits<zypp::SrcPackage>::kind, zypp::ZConfig::instance().systemArchitecture(), "" ) ); + return YCPBoolean( DoProvideNameKind( name, zypp::ResKind::srcpackage, zypp::ZConfig::instance().systemArchitecture(), "" ) ); } Modified: trunk/pkg-bindings/src/Resolvable_Install.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Inst… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Install.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Install.cc Thu Aug 7 17:15:02 2008 @@ -60,16 +60,16 @@ zypp::Arch architecture(arch_str); if( req_kind == "product" ) { - kind = zypp::ResTraits<zypp::Product>::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraits<zypp::Patch>::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraits<zypp::Package>::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraits<zypp::Pattern>::kind; + kind = zypp::ResKind::pattern; } else { @@ -102,16 +102,16 @@ std::string req_kind = kind_r->symbol (); if( req_kind == "product" ) { - kind = zypp::ResTraits<zypp::Product>::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraits<zypp::Patch>::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraits<zypp::Package>::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraits<zypp::Pattern>::kind; + kind = zypp::ResKind::pattern; } else { @@ -157,16 +157,16 @@ std::string req_kind = kind_r->symbol (); if( req_kind == "product" ) { - kind = zypp::ResTraits<zypp::Product>::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraits<zypp::Patch>::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraits<zypp::Package>::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraits<zypp::Pattern>::kind; + kind = zypp::ResKind::pattern; } else { @@ -200,16 +200,16 @@ bool force = force_r->value(); if( req_kind == "product" ) { - kind = zypp::ResTraits<zypp::Product>::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraits<zypp::Patch>::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraits<zypp::Package>::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraits<zypp::Pattern>::kind; + kind = zypp::ResKind::pattern; } else { @@ -266,16 +266,16 @@ std::string name = name_r->value(); if( req_kind == "product" ) { - kind = zypp::ResTraits<zypp::Product>::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraits<zypp::Patch>::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraits<zypp::Package>::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraits<zypp::Pattern>::kind; + kind = zypp::ResKind::pattern; } else { Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Thu Aug 7 17:15:02 2008 @@ -107,24 +107,16 @@ YCPList ret; if( req_kind == "product" ) { - kind = zypp::ResTraits<zypp::Product>::kind; -/* - zypp::ResPool pool( zypp::ResPool::instance() ); - - for_( it, pool.satisfiedProductsBegin(), pool.satisfiedProductsEnd() ) - { - zypp::Product_constPtr p( asKind<Product>(*it) ); - } -*/ + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraits<zypp::Patch>::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraits<zypp::Package>::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraits<zypp::Pattern>::kind; + kind = zypp::ResKind::pattern; } else if ( req_kind == "language" ) { @@ -410,16 +402,16 @@ std::string stat_str = status->symbol(); if( req_kind == "product" ) { - kind = zypp::ResTraits<zypp::Product>::kind; + kind = zypp::ResKind::product; } else if ( req_kind == "patch" ) { - kind = zypp::ResTraits<zypp::Patch>::kind; + kind = zypp::ResKind::patch; } else if ( req_kind == "package" ) { - kind = zypp::ResTraits<zypp::Package>::kind; + kind = zypp::ResKind::package; } else if ( req_kind == "pattern" ) { - kind = zypp::ResTraits<zypp::Pattern>::kind; + kind = zypp::ResKind::pattern; } else if ( req_kind == "any" ) { try Modified: trunk/pkg-bindings/src/Selection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Selection.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Selection.cc (original) +++ trunk/pkg-bindings/src/Selection.cc Thu Aug 7 17:15:02 2008 @@ -35,7 +35,6 @@ #include <ycp/YCPMap.h> #include <zypp/ResPool.h> -#include <zypp/ResTraits.h> #include <zypp/Pattern.h> using std::string; @@ -110,9 +109,9 @@ try { - for (zypp::ResPool::byKind_iterator it - = zypp_ptr()->pool().byKindBegin(zypp::ResTraits<zypp::Pattern>::kind); - it != zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Pattern>::kind) ; ++it ) + for (zypp::ResPool::byKind_iterator it + = zypp_ptr()->pool().byKindBegin(zypp::ResKind::pattern); + it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::pattern) ; ++it ) { std::string pattern; @@ -209,7 +208,7 @@ if ( it != zypp_ptr()->pool().byIdentEnd<zypp::Pattern>(name) ) { - zypp::Pattern::constPtr pattern = + zypp::Pattern::constPtr pattern = zypp::dynamic_pointer_cast<const zypp::Pattern>(it->resolvable ()); // pattern found @@ -347,7 +346,7 @@ @short Activate all selected selections - obsoleted, use PkgSolve() instead @return boolean true - + @deprecated Use Pkg::PkgSolve instead, selections are solvable now */ YCPBoolean Modified: trunk/pkg-bindings/src/Source_Get.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Get.cc?r… ============================================================================== --- trunk/pkg-bindings/src/Source_Get.cc (original) +++ trunk/pkg-bindings/src/Source_Get.cc Thu Aug 7 17:15:02 2008 @@ -279,9 +279,9 @@ try { // find a product for the given source - zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResTraits<zypp::Product>::kind); + zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(zypp::ResKind::product); - for( ; it != zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Product>::kind) ; ++it) + for( ; it != zypp_ptr()->pool().byKindEnd(zypp::ResKind::product) ; ++it) { zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>( it->resolvable() ); @@ -304,7 +304,7 @@ } } - if( it == zypp_ptr()->pool().byKindEnd(zypp::ResTraits<zypp::Product>::kind) ) + if( it == zypp_ptr()->pool().byKindEnd(zypp::ResKind::product) ) { y2error ("Product for source '%lld' not found", src_id->value()); } Modified: trunk/pkg-bindings/src/Target.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Target.cc (original) +++ trunk/pkg-bindings/src/Target.cc Thu Aug 7 17:15:02 2008 @@ -184,8 +184,10 @@ { zypp::ResPool pool( zypp::ResPool::instance() ); // ResPool is a global singleton - for_( it, pool.satisfiedProductsBegin(), pool.satisfiedProductsEnd() ) + for_( it, pool.byKindBegin<zypp::Product>(), pool.byKindEnd<zypp::Product>() ) { + if ( ! it->status().isInstalled() ) + continue; zypp::Product::constPtr product = asKind<zypp::Product>( it->resolvable() ); #warning TargetProducts does not return all keys -- 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] r49834 - /trunk/installation/control/docs/control-section.xml
by locilka＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: locilka Date: Thu Aug 7 17:14:20 2008 New Revision: 49834 URL: http://svn.opensuse.org/viewcvs/yast?rev=49834&view=rev Log: Some more docu Modified: trunk/installation/control/docs/control-section.xml Modified: trunk/installation/control/docs/control-section.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/contro… ============================================================================== --- trunk/installation/control/docs/control-section.xml (original) +++ trunk/installation/control/docs/control-section.xml Thu Aug 7 17:14:20 2008 @@ -756,6 +756,15 @@ <para>Section <emphasis>software</emphasis> also contains optional <emphasis>default_system_scenario</emphasis> that defines id of the default scenario.</para> + <para>There are some important texts that has to be defined for the dialog layout</para> + + <itemizedlist> + <listitem><para><emphasis>scenarios_caption</emphasis> - used as a dialog caption + for the Scenarios dialog.</para></listitem> + <listitem><para><emphasis>scenarios_text</emphasis> - used as an informative text + describing the available selections below.</para></listitem> + </itemizedlist> + </section> <section id="control_partitioning"> -- 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] r49833 - in /trunk/installation: control/ control/docs/ control/docs/examples/ package/ src/clients/
by locilka＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: locilka Date: Thu Aug 7 16:43:16 2008 New Revision: 49833 URL: http://svn.opensuse.org/viewcvs/yast?rev=49833&view=rev Log: - Added new client inst_scenarios to offer main scenarios of the newly installed system. - Configuration for inst_scenarios is defined in control file (Only SLES so far), client added into SLES workflow. - Extended control file documentation (All FATE #304373). Added: trunk/installation/control/docs/examples/software_scenarios.xml trunk/installation/src/clients/inst_scenarios.ycp Modified: trunk/installation/control/control.SLES.xml trunk/installation/control/docs/control-section.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Thu Aug 7 16:43:16 2008 @@ -82,6 +82,28 @@ </products_supported_for_upgrade> <selection_type config:type="symbol">auto</selection_type> + +  + <system_scenarios config:type="list"> + <system_scenario> + <id>scenario_physical_machine</id> + <patterns>physical_machine-pattern</patterns> + <icon>yast-system</icon> + </system_scenario> + <system_scenario> + <id>scenario_virtual_machine</id> + <patterns>virtual_machine-pattern</patterns> + <icon>yast-vm-install</icon> + </system_scenario> + <system_scenario> + <id>scenario_virtualization_host</id> + <patterns>virtualization_host-pattern</patterns> + <icon>yast-vm-management</icon> + </system_scenario> + </system_scenarios> + +  + <default_system_scenario>scenario_physical_machine</default_system_scenario> </software> <partitioning> @@ -140,6 +162,15 @@ </label> </congratulate> + +  + <scenarios_caption><label>Server Base Scenario</label></scenarios_caption> + <scenarios_text><label>SUSE Linux Enterprise Server offers several base scenarios. +Choose the one that matches your server the best.</label></scenarios_text> +  + <scenario_physical_machine><label>Physical Machine</label></scenario_physical_machine> + <scenario_virtual_machine><label>Virtual Machine</label></scenario_virtual_machine> + <scenario_virtualization_host><label>Virtualization Host</label></scenario_virtualization_host> </texts> <proposals config:type="list"> @@ -470,6 +501,11 @@ <heading>yes</heading> <label>Installation</label> </module> +  + <module> + <label>Server Scenario</label> + <name>scenarios</name> + </module> <module> <label>Installation Summary</label> <name>proposal</name> Modified: trunk/installation/control/docs/control-section.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/contro… ============================================================================== --- trunk/installation/control/docs/control-section.xml (original) +++ trunk/installation/control/docs/control-section.xml Thu Aug 7 16:43:16 2008 @@ -707,6 +707,57 @@ </itemizedlist> </section> + + <section id="control_software_scenarios"> + <title>System Scenarios</title> + + <para>System scenarios contain definition of dialog <emphasis>inst_scenarios</emphasis> + in the first stage installation. It offeres several base-scenarios but only one of them + can be selected as the selected one.</para> + + <para>Example of configured scenarios:</para> + <programlisting> + + <xi:include href="examples/software_scenarios.xml" parse="text" + xmlns:xi="http://www.w3.org/2001/XInclude"/> + </programlisting> + + <para>System scenarios are defined inside the <emphasis>software</emphasis> section. + Section <emphasis>system_scenarios</emphasis> consists of several + <emphasis>system_scenario</emphasis> definitions. Every single + <emphasis>system_scenario</emphasis> consists of:</para> + + <itemizedlist> + <listitem><para><emphasis>id</emphasis> - unique identificator of + a selection.</para></listitem> + <listitem><para><emphasis>patterns</emphasis> - space-separated list of patterns + covering the software scenario.</para></listitem> + <listitem><para><emphasis>icon</emphasis> - plain icon filename (from 32x32 theme + directory) without suffix.</para></listitem> + </itemizedlist> + + <para>Selection labels must be defined in <link linkend="control_texts">texts</link> section. + Scenarios <emphasis>id</emphasis>s are used as link identificators.</para> + + <programlisting> + + <software> + <system_scenario> + <id><emphasis>scenario_id</emphasis></id> + </system_scenario> + </software> + + <texts> + <<emphasis>scenario_id</emphasis>><label>Some Label</label></<emphasis>scenario_id</emphasis>> + </texts> + + </programlisting> + + <para>Section <emphasis>software</emphasis> also contains optional + <emphasis>default_system_scenario</emphasis> that defines id of the default scenario.</para> + + </section> + <section id="control_partitioning"> <title>Partitioning</title> <para> Added: trunk/installation/control/docs/examples/software_scenarios.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/exampl… ============================================================================== --- trunk/installation/control/docs/examples/software_scenarios.xml (added) +++ trunk/installation/control/docs/examples/software_scenarios.xml Thu Aug 7 16:43:16 2008 @@ -0,0 +1,52 @@ + +<productDefines xmlns="http://www.suse.com/1.0/yast2ns" + xmlns:config="http://www.suse.com/1.0/configns"> + <software> + +  + <system_scenarios config:type="list"> + +  + <system_scenario> +  + <id>scenario_game_server</id> +  + <patterns>game_server-pattern high-load-server</patterns> +  + <icon>yast-system</icon> + </system_scenario> + + <system_scenario> + <id>scenario_web_server</id> + <patterns>web_server-pattern</patterns> + <icon>yast-http-server</icon> + </system_scenario> + + <system_scenario> + <id>scenario_nfs_server</id> + <patterns>nfs_server-pattern</patterns> + <icon>yast-nfs-server</icon> + </system_scenario> + + </system_scenarios> + +  + <default_system_scenario>scenario_nfs_server</default_system_scenario> + + </software> + + <texts> + +  + <scenarios_caption><label>Server Base Scenario</label></scenarios_caption> +  + <scenarios_text><label>SUSE Linux Enterprise Server offers several base scenarios. +Choose the one that matches your server the best.</label></scenarios_text> + +  + <scenario_game_server><label>Game Server</label></scenario_game_server> + <scenario_web_server><label>Web Server</label></scenario_web_server> + <scenario_nfs_server><label>NFS Server</label></scenario_nfs_server> + + </texts> +</productDefines> 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 Aug 7 16:43:16 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Aug 7 16:40:32 CEST 2008 - locilka(a)suse.cz + +- Added new client inst_scenarios to offer main scenarios of the + newly installed system. +- Configuration for inst_scenarios is defined in control file (Only + SLES so far), client added into SLES workflow. +- Extended control file documentation (All FATE #304373). + +------------------------------------------------------------------- Wed Aug 6 13:54:07 CEST 2008 - locilka(a)suse.cz - New control file entry globals->enable_kdump (default value) Added: trunk/installation/src/clients/inst_scenarios.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sc… ============================================================================== --- trunk/installation/src/clients/inst_scenarios.ycp (added) +++ trunk/installation/src/clients/inst_scenarios.ycp Thu Aug 7 16:43:16 2008 @@ -0,0 +1,228 @@ +/** + * File: clients/inst_scenarios.ycp + * Package: Installation (First Stage) + * Summary: Server/Desktop Scenarios + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + * $Id:$ + */ + +{ + // See FATE: #304373: Align installation process to use scenarios for Server in early stage + + textdomain "installation"; + + import "ProductControl"; + import "ProductFeatures"; + import "Wizard"; + import "Icon"; + import "Installation"; + import "Popup"; + import "PackageCallbacks"; + import "Report"; + + boolean test_mode = false; + + if (size (WFM::Args()) > 0 && is (WFM::Args(0), string)) { + y2milestone ("Args: %1", WFM::Args()); + if (WFM::Args(0) == "test") test_mode = true; + } + + // load supported scenarios from control file + list <map <string, string> > system_scenarios = + (list <map <string, string> >) ProductFeatures::GetFeature ("software", "system_scenarios"); + + if (system_scenarios == nil || system_scenarios == []) { + y2error ("Undefined software->system_scenarios"); + return `auto; + } + + /** + * Adjusts UI - selected radio button + */ + void SelectAppropriateRadioButton () { + list <map <string, any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); + + string selected_id = nil; + + // check all scenarios + foreach (map <string, string> one_scenario, system_scenarios, { + list <string> patterns_required = splitstring (one_scenario["patterns"]:"", " \t"); + + integer matching_patterns = 0; + + foreach (map <string, any> one_pattern, patterns, { + if ( + contains (patterns_required, one_pattern["name"]:"") && + (one_pattern["status"]:`a == `installed || one_pattern["status"]:`a == `selected) + ) { + matching_patterns = matching_patterns + 1; + } + }); + + // there are some matching patterns + // they match required patterns + if (matching_patterns > 0 && matching_patterns >= size (patterns_required)) { + y2milestone ("Matching: %1 (%2)", one_scenario["id"]:"", one_scenario["patterns"]:""); + if (selected_id == nil) { + selected_id = one_scenario["id"]:""; + } else { + y2warning ("Scenario %1 already selected", selected_id); + } + } + }); + + // matching patterns found + if (selected_id != nil) { + UI::ChangeWidget (`id (`scenarios), `CurrentButton, selected_id); + + // using fallback from control file + } else { + string default_selection = ProductFeatures::GetStringFeature ("software", "default_system_scenario"); + + if (default_selection == nil || default_selection == "") { + y2warning ("No default selection defined"); + } else { + y2milestone ("Pre-selecting default selection"); + if (UI::WidgetExists (`id (default_selection))) + UI::ChangeWidget (`id (`scenarios), `CurrentButton, default_selection); + else + y2error ("No such selection: %1", default_selection); + } + } + } + + void SelectPatterns (string chosen_selection) { + y2milestone ("User selected: %1", chosen_selection); + + // neutralize 'the other' patterns selected by application + foreach (map <string, string> one_scenario, system_scenarios, { + if (one_scenario["id"]:"---" != chosen_selection) { + foreach (string one_pattern, splitstring (one_scenario["patterns"]:"", " \t"), { + y2milestone ("Neutralizing pattern: %1", one_pattern); + // false -- only patterns in `selected stage APPL_HIGH will be neutralized + Pkg::ResolvableNeutral (one_pattern, `pattern, false); + }); + } + }); + + // select newly selected patterns for installation + foreach (map <string, string> one_scenario, system_scenarios, { + if (one_scenario["id"]:"---" == chosen_selection) { + foreach (string one_pattern, splitstring (one_scenario["patterns"]:"", " \t"), { + y2milestone ("Selecting pattern: %1", one_pattern); + Pkg::ResolvableInstall (one_pattern, `pattern); + }); + } + }); + } + + // adjusting test mode - not used in installation + if (test_mode) { + Wizard::CreateDialog(); + Pkg::TargetInit (Installation::destdir, true); + Pkg::SourceStartManager (true); + // pre-select +// foreach (string one_pattern, splitstring (system_scenarios[0,"patterns"]:"", " \t"), { +// Pkg::ResolvableInstall (one_pattern, `pattern); +// }); + Pkg::PkgSolve (true); + } + + y2milestone ("Supported scenarios: %1", system_scenarios); + + term GetDialogContents () { + term dialog_content = `VBox(); + + foreach (map <string, string> one_scenario, system_scenarios, { + dialog_content = add (dialog_content, `HBox ( + `HWeight ( + 1, + (one_scenario["icon"]:"" == "" ? + `Empty () + : + `HBox (`Image (Icon::IconPath (one_scenario["icon"]:""), ""), `HSpacing (2)) + ) + ), + `HWeight ( + 4, + `Left (`RadioButton ( + `id (one_scenario["id"]:""), + ProductControl::GetTranslatedText (one_scenario["id"]:"") + )) + ) + )); + + dialog_content = add (dialog_content, `VSpacing (0.8)); + }); + + dialog_content = `VBox ( + `Label (ProductControl::GetTranslatedText ("scenarios_text")), + `VSpacing (2), + `HSquash (`Frame ( + // TRANSLATORS: frame label + _("Choose Scenario"), + `RadioButtonGroup ( + `id (`scenarios), + `MarginBox (2, 1.3, dialog_content) + ) + )) + ); + + return dialog_content; + } + + // TRANSLATORS: help text + string dialog_help = _("Select a scenario that matches your needs the best. +Additional software can be selected later in software proposal."); + + // Adjust dialog + Wizard::SetContents ( + ProductControl::GetTranslatedText ("scenarios_caption"), + GetDialogContents(), + dialog_help, + true, + true + ); + Wizard::SetTitleIcon ("yast-software"); + + SelectAppropriateRadioButton(); + + any user_input = nil; + symbol ret = `auto; + + // Handle user input + while (true) { + user_input = UI::UserInput(); + + if (user_input == `next) { + string chosen_selection = (string) UI::QueryWidget (`id (`scenarios), `CurrentButton); + + if (chosen_selection == nil || chosen_selection == "") { + // TRANSLATORS: pop-up message + Report::Message (_("Choose one scenario, please.")); + } else { + SelectPatterns (chosen_selection); + ret = `next; + break; + } + } else if (user_input == `back) { + ret = `back; + break; + } else if (user_input == `abort || user_input == `cancel) { + if (Popup::ConfirmAbort (`painless)) { + ret = `abort; + break; + } + } else { + y2error ("Unexpected ret: %1", user_input); + } + } + + // test mode - not used in installation + if (test_mode) Wizard::CloseDialog(); + + y2milestone ("Returning: %1", ret); + return ret; +/* EOF */ +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49832 - in /trunk/auditd/src: complex.ycp dialogs.ycp
by gs＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: gs Date: Thu Aug 7 16:42:05 2008 New Revision: 49832 URL: http://svn.opensuse.org/viewcvs/yast?rev=49832&view=rev Log: set correct initial value of enabled flag Modified: trunk/auditd/src/complex.ycp trunk/auditd/src/dialogs.ycp Modified: trunk/auditd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/complex.ycp?rev=49832… ============================================================================== --- trunk/auditd/src/complex.ycp (original) +++ trunk/auditd/src/complex.ycp Thu Aug 7 16:42:05 2008 @@ -184,8 +184,27 @@ } void InitRulesDialog( string id ) { - - UI::ChangeWidget( `id( "rules"), `Value, Auditd::GetRules() ); + string rules = Auditd::GetRules(); + string combo_box_id = "disabled"; + + UI::ChangeWidget( `id( "rules"), `Value, rules ); + list <string> rules_list = splitstring( rules, "\n" ); + + foreach ( string rule, rules_list, { + if ( regexpmatch( rule, "^[ /t]*-e[ /t]*2" ) ) + { + combo_box_id = "locked"; + } + else if ( regexpmatch( rule, "^[ /t]*-e[ /t]*1" ) ) + { + combo_box_id = "enabled"; + } + else if ( regexpmatch( rule, "^[ /t]*-e[ /t]*0" ) ) + { + combo_box_id = "disabled"; + } + } ); + UI::ChangeWidget( `id( "audit_enabled"), `Value, combo_box_id ); y2milestone ( "Init rules dialog" ); } @@ -204,15 +223,15 @@ switch ( value ) { - case "lock": { + case "locked": { rule = "-e 2"; break; } - case "enable": { + case "enabled": { rule = "-e 1"; break; } - case "disable": { + case "disabled": { rule = "-e 0"; break; } Modified: trunk/auditd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/dialogs.ycp?rev=49832… ============================================================================== --- trunk/auditd/src/dialogs.ycp (original) +++ trunk/auditd/src/dialogs.ycp Thu Aug 7 16:42:05 2008 @@ -186,10 +186,10 @@ `VBox( `VWeight( 20, `Frame( _("" ), `VBox( - `Left(`ComboBox( `id("audit_enabled"), `opt(`notify), _("Configure Enabled Flag"), - [`item(`id("enable"), _("Enable Auditing"), true ), // -e 1 - `item(`id("disable"), _("Disable Auditing") ), // -e 0 - `item(`id("lock"), _("Lock Rules (until next boot)")) // -e 2 + `Left(`ComboBox( `id("audit_enabled"), `opt(`notify), _("Set Enabled Flag"), + [`item(`id("enabled"), _("Auditing enabled"), true ), // -e 1 + `item(`id("disabled"), _("Auditing disabled") ), // -e 0 + `item(`id("locked"), _("Rules are locked (until next boot)")) // -e 2 ] )), `VStretch() @@ -207,7 +207,7 @@ `HSpacing(2.0), `PushButton( `id( "reset" ), _("Restore and Reset") ), `HSpacing(2.0), - `PushButton( `id( "load" ), _("Load Example") ) + `PushButton( `id( "load" ), _("Load ") ) ) ), `VStretch() -- 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] r49831 - /tags/stable-2_17_0/irda/
by jsuchome＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: jsuchome Date: Thu Aug 7 16:29:30 2008 New Revision: 49831 URL: http://svn.opensuse.org/viewcvs/yast?rev=49831&view=rev Log: Created tag stable-2_17_0 for irda Added: tags/stable-2_17_0/irda/ - copied from r49830, trunk/irda/ -- 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] r49830 - /trunk/nfs-client/src/routines.ycp
by kmachalkova＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: kmachalkova Date: Thu Aug 7 16:28:34 2008 New Revision: 49830 URL: http://svn.opensuse.org/viewcvs/yast?rev=49830&view=rev Log: Extended list of supported NFS mount options (#411013) Modified: trunk/nfs-client/src/routines.ycp Modified: trunk/nfs-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/routines.ycp?rev=… ============================================================================== --- trunk/nfs-client/src/routines.ycp (original) +++ trunk/nfs-client/src/routines.ycp Thu Aug 7 16:28:34 2008 @@ -141,8 +141,8 @@ //the options must be easy to sync with mount.c and nfsmount.c // these can be negated by "no" - list<string> non_value = ["bg", "fg", "soft", "hard", "intr", "posix", "cto", "ac", - "lock", "tcp", "udp", + list<string> non_value = ["bg", "fg", "soft", "hard", "intr", "posix", "cto", "ac", "acl", + "lock", "tcp", "udp", "rdirplus", // these are common for all fs types "atime", "auto", "dev", "exec", "group", "owner", "suid", "user", "users"]; @@ -152,8 +152,8 @@ "remount", "bind", "rbind", "_netdev", ]; list with_value = ["rsize", "wsize", "timeo", "retrans", "acregmin", "acregmax", "acdirmin", "acdirmin", "acdirmax", "actimeo", "retry", "namlen", - "port", "mountport", "mountport", "mounthost", "mountprog", - "mountvers", "nfsprog", "nfsvers"]; + "port", "proto", "clientaddr", "mountport", "mounthost", + "mountprog", "mountvers", "nfsprog", "nfsvers", "vers", "sec" ]; integer i = 0; string current_option = ""; -- 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] r49829 - in /trunk/irda: VERSION package/yast2-irda.changes src/ui.ycp
by jsuchome＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: jsuchome Date: Thu Aug 7 16:28:08 2008 New Revision: 49829 URL: http://svn.opensuse.org/viewcvs/yast?rev=49829&view=rev Log: - button labels adapted to current style guide (bnc#398482) - 2.17.0 Modified: trunk/irda/VERSION trunk/irda/package/yast2-irda.changes trunk/irda/src/ui.ycp Modified: trunk/irda/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/VERSION?rev=49829&r1=49828&… ============================================================================== --- trunk/irda/VERSION (original) +++ trunk/irda/VERSION Thu Aug 7 16:28:08 2008 @@ -1 +1 @@ -2.16.1 +2.17.0 Modified: trunk/irda/package/yast2-irda.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/package/yast2-irda.changes?… ============================================================================== --- trunk/irda/package/yast2-irda.changes (original) +++ trunk/irda/package/yast2-irda.changes Thu Aug 7 16:28:08 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 7 16:24:19 CEST 2008 - jsuchome(a)suse.cz + +- button labels adapted to current style guide (bnc#398482) +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file Modified: trunk/irda/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/src/ui.ycp?rev=49829&r1=498… ============================================================================== --- trunk/irda/src/ui.ycp (original) +++ trunk/irda/src/ui.ycp Thu Aug 7 16:28:08 2008 @@ -81,7 +81,7 @@ // Wait text label `Label(_("Initializing -- please wait...")), `VSpacing(1), - `PushButton(`id(`done), `opt(`default), Label::AbortButton()), + `PushButton(`id(`done), `opt(`default), Label::CancelButton()), `VSpacing(1)), `HSpacing(1.5) )); @@ -253,8 +253,7 @@ ), `HSpacing(3)); - Wizard::SetContentsButtons (caption, con, help, - Label::BackButton (), Label::FinishButton()); + Wizard::SetContents (caption, con, help, true, true); UI::ChangeWidget (`id(`ports), `Value, port); @@ -342,7 +341,7 @@ */ define symbol IrDASequence () { - Wizard::CreateDialog(); + Wizard::OpenOKDialog (); Wizard::SetDesktopIcon("irda"); Irda::Read (); -- 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] r49828 - /tags/stable-2_17_4/country/
by jsuchome＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: jsuchome Date: Thu Aug 7 16:13:40 2008 New Revision: 49828 URL: http://svn.opensuse.org/viewcvs/yast?rev=49828&view=rev Log: Created tag stable-2_17_4 for country Added: tags/stable-2_17_4/country/ - copied from r49827, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49827 - in /trunk/country: VERSION keyboard/src/keyboard.ycp language/src/language.ycp package/yast2-country.changes timezone/src/timezone.ycp
by jsuchome＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: jsuchome Date: Thu Aug 7 16:13:36 2008 New Revision: 49827 URL: http://svn.opensuse.org/viewcvs/yast?rev=49827&view=rev Log: - button labels adapted to current style guide (bnc#398497,#398493) - 2.17.4 Modified: trunk/country/VERSION trunk/country/keyboard/src/keyboard.ycp trunk/country/language/src/language.ycp trunk/country/package/yast2-country.changes trunk/country/timezone/src/timezone.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=49827&r1=498… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Aug 7 16:13:36 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: trunk/country/keyboard/src/keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/keyboard.yc… ============================================================================== --- trunk/country/keyboard/src/keyboard.ycp (original) +++ trunk/country/keyboard/src/keyboard.ycp Thu Aug 7 16:13:36 2008 @@ -82,7 +82,7 @@ KeyboardRead (); - Wizard::OpenAcceptDialog(); + Wizard::OpenOKDialog(); symbol result = KeyboardDialog ($[]); Modified: trunk/country/language/src/language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/language.yc… ============================================================================== --- trunk/country/language/src/language.ycp (original) +++ trunk/country/language/src/language.ycp Thu Aug 7 16:13:36 2008 @@ -120,7 +120,7 @@ // set the language accoring to Language.ycp initialization Language::WfmSetLanguage (); - Wizard::OpenAcceptDialog(); + Wizard::OpenOKDialog(); // Params are: `back `next set_default map args = $[]; Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Aug 7 16:13:36 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 7 16:07:06 CEST 2008 - jsuchome(a)suse.cz + +- button labels adapted to current style guide (bnc#398497,#398493) +- 2.17.4 + +------------------------------------------------------------------- Wed Jul 23 16:48:12 CEST 2008 - mvidner(a)suse.cz - Marked strings for some error cases for translation (bnc#400376). Modified: trunk/country/timezone/src/timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/timezone.yc… ============================================================================== --- trunk/country/timezone/src/timezone.ycp (original) +++ trunk/country/timezone/src/timezone.ycp Thu Aug 7 16:13:36 2008 @@ -61,7 +61,7 @@ define any TimezoneSequence () { // create the wizard dialog - Wizard::OpenAcceptDialog(); + Wizard::OpenOKDialog(); any result = TimezoneDialog ($[]); -- 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] r49826 - /trunk/nfs-client/src/ui.ycp
by kmachalkova＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: kmachalkova Date: Thu Aug 7 15:56:39 2008 New Revision: 49826 URL: http://svn.opensuse.org/viewcvs/yast?rev=49826&view=rev Log: Two-tab dialog: one tab for nfs fstab entries and the other one for settings (firewall, nfs4 etc.) Modified: trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=49826&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu Aug 7 15:56:39 2008 @@ -441,7 +441,29 @@ list<map<string,any> > nfs_entries = Nfs::nfs_entries; - term contents = + void InitFstabEntries( ) + { + UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries)); + } + + void InitSettings( ) + { + CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); + UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled); + } + + void SaveFstabEntries( map event ) + { + Nfs::nfs_entries = nfs_entries; + } + + void SaveSettings( map event ) + { + CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); + Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); + } + + term fstab_contents = `VBox( `Table(`id(`fstable), `opt(`notify, `immediate), `header( @@ -462,18 +484,29 @@ `PushButton(`id(`delbut), `opt (`key_F5), Label::DeleteButton ()), // #211570 - `HStretch ()), - `VSpacing (1), - `HBox( - `Left(`CheckBox(`id(`enable_nfs4), `opt(`notify), _("Enable NFSv4"))), - `Left(`InputField(`id(`nfs4_domain), _("NFSv4 Domain Name"))), - `HStretch() - ), - `VSpacing (1), - fw_cwm_widget["custom_widget"]:`Empty (), - // frame label - `VSpacing(0.2) - ); + `HStretch ()) + ); + term settings_content = + `VBox( + //`VSpacing (1), + `HBox( + `Left(`CheckBox(`id(`enable_nfs4), `opt(`notify), _("Enable NFSv4"))), + `Left(`InputField(`id(`nfs4_domain), _("NFSv4 Domain Name"))), + `HStretch() + ), + `VSpacing (1), + fw_cwm_widget["custom_widget"]:`Empty (), + `VStretch() + ); + + term contents = + `VBox( + `DumbTab( + [ `item(`id(`overview),_("&NFS Shares")), + `item(`id(`settings), _("NFS &Settings")) ], + `ReplacePoint(`id(`rp), fstab_contents) + ) + ); // dialog heading Wizard::SetContentsButtons(_("NFS Client Configuration"), @@ -482,7 +515,7 @@ Label::FinishButton ()); // initialize the widget (set the current value) - CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); + //CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); UI::ChangeWidget (`id(`editbut), `Enabled, false); UI::ChangeWidget (`id(`delbut), `Enabled, false); @@ -491,18 +524,23 @@ map event = nil; any ret = nil; + integer entryno = -1; do { - integer entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); - UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil); - UI::ChangeWidget (`id(`delbut), `Enabled, entryno != nil); - - // Kludge, because a `Table still does not have a shortcut. - // Simple to solve here: there's only the table and buttons, - // so it is OK to always set focus to the table - UI::SetFocus (`id (`fstable)); + if ( UI::WidgetExists(`id(`fstable)) ) + { + entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); + UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil); + UI::ChangeWidget (`id(`delbut), `Enabled, entryno != nil); + + // Kludge, because a `Table still does not have a shortcut. + // Simple to solve here: there's only the table and buttons, + // so it is OK to always set focus to the table + UI::SetFocus (`id (`fstable)); + + } event = UI::WaitForEvent (); ret = event["ID"]:nil; @@ -512,11 +550,13 @@ } // handle the events, enable/disable the button, show the popup if button clicked - CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", event); - changed = + if ( UI::WidgetExists(`id("_cwm_firewall_details")) && UI::WidgetExists(`id("_cwm_open_firewall")) ) + CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", event); + /*changed = true || // TODO: fw changed, #44106 - true; // TODO: nfs changed - entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); + true; // TODO: nfs changed*/ + if ( UI::WidgetExists(`id(`fstable)) ) + entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); if (ret == `newbut) { @@ -557,6 +597,18 @@ boolean enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4), `Value); UI::ChangeWidget( `id(`nfs4_domain), `Enabled, enabled); } + else if ( ret == `settings ) + { + SaveFstabEntries( event ); + UI::ReplaceWidget(`id(`rp), settings_content); + InitSettings(); + } + else if ( ret == `overview ) + { + SaveSettings( event ); + UI::ReplaceWidget(`id(`rp), fstab_contents); + InitFstabEntries(); + } else if (ret == `abort && changed && !Popup::ReallyAbort (true)) { ret = `again; @@ -567,10 +619,11 @@ if (ret == `next) { // grab current settings, store them to SuSEFirewall:: - CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); + if( UI::WidgetExists(`id(`fstable)) ) + SaveFstabEntries( event ); + if( UI::WidgetExists(`id(`enable_nfs4)) ) + SaveSettings( event ); - Nfs::nfs_entries = nfs_entries; - Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); } Wizard::RestoreScreenShotName (); -- 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] r49825 - in /trunk/auditd/src: complex.ycp dialogs.ycp
by gs＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: gs Date: Thu Aug 7 15:56:37 2008 New Revision: 49825 URL: http://svn.opensuse.org/viewcvs/yast?rev=49825&view=rev Log: add the possibility to example rules file Modified: trunk/auditd/src/complex.ycp trunk/auditd/src/dialogs.ycp Modified: trunk/auditd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/complex.ycp?rev=49825… ============================================================================== --- trunk/auditd/src/complex.ycp (original) +++ trunk/auditd/src/complex.ycp Thu Aug 7 15:56:37 2008 @@ -280,6 +280,14 @@ Report::Error( _("Cannnot create tmp file for rules" ) ); } } + else if ( action == "load" ) + { + string file_name = UI::AskForExistingFile("/usr/share/doc/packages/audit", "*.rules", _("Select example file") ); + string example_rules = (string)SCR::Read(.target.string, file_name ); + + UI::ChangeWidget( `id("rules"), `Value, example_rules ); + y2milestone( "Example rules loaded: %1", file_name ); + } return nil; } Modified: trunk/auditd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/dialogs.ycp?rev=49825… ============================================================================== --- trunk/auditd/src/dialogs.ycp (original) +++ trunk/auditd/src/dialogs.ycp Thu Aug 7 15:56:37 2008 @@ -188,7 +188,8 @@ `VBox( `Left(`ComboBox( `id("audit_enabled"), `opt(`notify), _("Configure Enabled Flag"), [`item(`id("enable"), _("Enable Auditing"), true ), // -e 1 - `item(`id("disable"), _("Disable Auditing") ) // -e 0 + `item(`id("disable"), _("Disable Auditing") ), // -e 0 + `item(`id("lock"), _("Lock Rules (until next boot)")) // -e 2 ] )), `VStretch() @@ -204,7 +205,9 @@ `HSpacing(2.0), `PushButton( `id( "restore" ), _("Restore 'audit.rules'") ), `HSpacing(2.0), - `PushButton( `id( "reset" ), _("Restore and Reset") ) + `PushButton( `id( "reset" ), _("Restore and Reset") ), + `HSpacing(2.0), + `PushButton( `id( "load" ), _("Load Example") ) ) ), `VStretch() -- 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] r49824 - in /branches/tmp/lslezak/product-creator-cross-arch/src: ProductCreator.ycp complex.ycp dialogs.ycp
by lslezak＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: lslezak Date: Thu Aug 7 15:42:40 2008 New Revision: 49824 URL: http://svn.opensuse.org/viewcvs/yast?rev=49824&view=rev Log: - distinguish between package arch (like i686) and system arch (i386) Modified: branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp Thu Aug 7 15:42:40 2008 @@ -97,24 +97,50 @@ /* Target architecture + Initialized to the current architecture */ -string _arch = Arch::architecture(); +// forward declaration +string ToPackageArch(string arch); + +// default is the system architecture +string _arch = nil; + +string ToPackageArch(string arch) +{ + if (arch == "s390_64") + { + arch = "s390x"; + } + if (arch == "s390_32") + { + arch = "s390"; + } + + if (!contains(["i386", "i486", "i586", "i686", "sparc", "sparc64", "mips", "mips64", "ppc", "ppc64", "alpha", "s390", "s390x", "ia64", "x86_64"], arch)) + { + y2error("Unknown architecture '%1'!", arch); + return nil; + } + + return arch; +} /** - Set the target archiotecture - @param new_arch new architecture (i386, sparc, sparc64, mips, mips64, ppc, ppc64, alpha, s390_32, s390_64, ia64, x86_64) + Set the target package architecture + @param new_arch new architecture (i386, i486, i586, i686, sparc, sparc64, mips, mips64, ppc, ppc64, alpha, s390, s390x, ia64, x86_64) @return true on success */ -global boolean SetArch(string new_arch) +global boolean SetPackageArch(string new_arch) { - if (!contains(["i386", "sparc", "sparc64", "mips", "mips64", "ppc", "ppc64", "alpha", "s390_32", "s390_64", "ia64", "x86_64"], new_arch)) + string pkgarch = ToPackageArch(new_arch); + + if (pkgarch == nil) { - y2error("Unknown architecture '%1'!", new_arch); return false; } - _arch = new_arch; + _arch = pkgarch; y2milestone("Target architecture set to '%1'", new_arch); // set the architecture in the package manager @@ -123,18 +149,47 @@ return true; } +// convert package (like i686) arch to system arch (i386) global string GetArch() { + string ret = _arch; + + // not set, use the current arch + if (ret == nil) + { + ret = Arch::architecture(); + } + + // convert x86 package archs to i386 system arch + if (contains(["i486", "i586", "i686"], ret)) + { + ret = "i386"; + } + else if (ret == "s390_64") + { + ret = "s390x"; + } + else if (ret == "s390_32") + { + ret = "s390"; + } + + return ret; +} + +// nil means not set +global string GetPackageArch() +{ return _arch; } global void ResetArch() { - _arch = Arch::architecture(); - y2milestone("Resetting the target architecture to '%1'", _arch); + _arch = nil; - // set the architecture in the package manager - Pkg::SetArchitecture(_arch); + // set the system architecture in the package manager + y2milestone("Resetting the target architecture to '%1'", Pkg::SystemArchitecture()); + Pkg::SetArchitecture(Pkg::SystemArchitecture()); } Modified: branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp Thu Aug 7 15:42:40 2008 @@ -121,6 +121,8 @@ any ret = nil; while(true) { + // reset the current architecture (needed when going back) + ProductCreator::ResetArch(); ret = UI::UserInput(); @@ -483,7 +485,7 @@ string arch = ProductCreator::Config["arch"]:""; if (arch != nil && arch != "") { - ProductCreator::SetArch(arch); + ProductCreator::SetPackageArch(arch); } Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Thu Aug 7 15:42:40 2008 @@ -202,7 +202,7 @@ string arch = ProductCreator::Config["arch"]:""; if (arch != nil && arch != "") { - ProductCreator::SetArch(arch); + ProductCreator::SetPackageArch(arch); } string name = (string)UI::QueryWidget(`id(`name), `Value); @@ -441,7 +441,7 @@ } integer archsz = size(archs); - integer col1num = (archsz > max_lines) ? archsz / 2 : archsz; + integer col1num = (archsz > max_lines) ? (archsz + 1) / 2 : archsz; y2milestone("Number of archs in the first column: %1", col1num); // preselect the first item @@ -467,9 +467,9 @@ `Frame(_("Target Architecture"), `RadioButtonGroup(`id(`rb), `HBox( - widget1, + `Top(widget1), `HStretch(), - widget2, + `Top(widget2), `HStretch() ) ) @@ -477,7 +477,7 @@ `VSpacing(1), `HBox( `HSpacing(`opt(`hstretch), 2), - `HWeight(1, `PushButton(`id(`change), Label::OKButton())), + `HWeight(1, `PushButton(`id(`ok), Label::OKButton())), `HSpacing(2), `HWeight(1, `PushButton(`id(`cancel), Label::CancelButton())), `HSpacing(`opt(`hstretch), 2) @@ -492,16 +492,21 @@ UI::CloseDialog(); - if (ui == `cancel) + if (ui == `cancel || ui == `close) { // canceled return nil; } - else + else if (ui == `ok) { y2milestone("Selected architecture: %1", ret); return ret; } + else + { + y2error("Unhandled user input %1", ui); + return nil; + } } @@ -573,7 +578,7 @@ if (new_arch != nil) { // change the architecture - ProductCreator::SetArch(new_arch); + ProductCreator::SetPackageArch(new_arch); // initialize the target, read trusted GPG keys (needed for refresh) Pkg::TargetInit("/", true); @@ -668,7 +673,6 @@ else if (ret == `select) { integer SrcID = (integer)UI::QueryWidget(`id(`table), `CurrentItem); - string target_arch = ProductCreator::GetArch(); boolean repo_ok = CheckArchitecture(SrcID); @@ -690,10 +694,10 @@ UI::ChangeWidget(`id(`table), `Item(SrcID, 0) , _("X")); // refresh the target architecture if it has been changed - if (target_arch != ProductCreator::GetArch()) + if (ProductCreator::GetPackageArch() != nil) { UI::ReplaceWidget(`rp, - `Label(sformat(_("Target Architecture: %1"), ProductCreator::GetArch())) + `Label(sformat(_("Target Architecture: %1"), ProductCreator::GetPackageArch())) ); } } @@ -753,10 +757,12 @@ continue; } - if (ProductCreator::GetArch() != Arch::architecture()) + string arch = ProductCreator::GetPackageArch() ; + + if (arch != nil && arch != Arch::architecture()) { y2milestone("Target architecture has been changed"); - ProductCreator::Config["arch"] = ProductCreator::GetArch(); + ProductCreator::Config["arch"] = arch; // TODO: check archs onece again (needed after switching architecture multiple times) // reload repositories @@ -774,21 +780,28 @@ else if (ret == `arch) { // ask for the target architecture + string pkg_arch = ProductCreator::GetPackageArch(); + + if (pkg_arch == nil) + { + pkg_arch = Pkg::SystemArchitecture(); + } + string new_arch = AskArch( _("Select the new target architecture."), - // sort the lilst according to the current locale - lsort(["i386", "sparc", "sparc64", "mips", "mips64", "ppc", "ppc64", "alpha", - "s390_32", "s390_64", "ia64", "x86_64"]), - ProductCreator::GetArch()); + // sort the list according to the current locale + lsort(["i386", "i486", "i586", "i686", "sparc", "sparc64", "mips", "mips64", "ppc", "ppc64", "alpha", + "s390", "s390x", "ia64", "x86_64"]), + pkg_arch); // nil == switch has been canceled - if (new_arch != nil && new_arch != "" && new_arch != ProductCreator::GetArch()) + if (new_arch != nil && new_arch != "" && new_arch != pkg_arch) { // change the architecture - ProductCreator::SetArch(new_arch); + ProductCreator::SetPackageArch(new_arch); UI::ReplaceWidget(`rp, - `Label(sformat(_("Target Architecture: %1"), ProductCreator::GetArch())) + `Label(sformat(_("Target Architecture: %1"), ProductCreator::GetPackageArch())) ); } } -- 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] r49823 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 15:23:33 2008 New Revision: 49823 URL: http://svn.opensuse.org/viewcvs/yast?rev=49823&view=rev Log: - cleanup Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 15:23:33 2008 @@ -1,32 +1,10 @@ -/* - ************************************************************* - * - * YaST2 SuSE Labs -o) - * -------------------- /\\ - * _\_v - * www.suse.de / www.suse.com - * ---------------------------------------------------------- - * - * Author: Michael Hager <mike(a)suse.de> - * - * Description: Partitioner for experts. - * - * - * Purpose: - * -Determing possible partitions. - * -Ask the user which partition to use. - * -Check the input and return error-messages. - * -Writing user_settings with the selected partitions. - * - * user_settings: used: targets - * - * external function: get_partition_info: get a list of current partitions - * check4partitions: read the disk-information - * - * - ************************************************************* - -*/ +/** + * File: inst_custem_part.ycp + * Package: yast2-storage + * Summary: Entry Point for Expert Partitioner + * Authors: Michael Hager <mike(a)suse.de> + * Arvin Schnell <aschnell(a)suse.de> + */ { textdomain "storage"; @@ -34,6 +12,11 @@ include "partitioning/ep-main.ycp"; + return ExpertPartitioner(); + + + + import "Arch"; import "Installation"; import "Mode"; @@ -1832,14 +1815,6 @@ }; - ///////////////////////////////////////////////////////////////// - // MAIN: - ///////////////////////////////////////////////////////////////// - - return ExpertPartitioner(); - - - symbol ret = nil; y2milestone( "Custom partitioner started" ); -- 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] r49822 - in /trunk/storage/storage/src: include/ep-main.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 15:19:42 2008 New Revision: 49822 URL: http://svn.opensuse.org/viewcvs/yast?rev=49822&view=rev Log: - cleanup Modified: trunk/storage/storage/src/include/ep-main.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Thu Aug 7 15:19:42 2008 @@ -8,17 +8,32 @@ textdomain "storage"; + import "Mode"; + import "Stage"; + import "Label"; import "Hostname"; import "TabPanel"; import "TreePanel"; import "Popup"; + import "Storage"; import "StorageFields"; import "StorageSettings"; + import "Wizard"; import "MiniWorkflow"; import "Greasemonkey"; import "Partitions"; + import "FileSystems"; import "DevicesSelectionBox"; import "Integer"; + import "String"; + + + include "partitioning/lvm_ui_dialogs.ycp"; + include "partitioning/lvm_pv_lib.ycp"; + include "partitioning/raid_lib.ycp"; + include "partitioning/custom_part_lib.ycp"; + include "partitioning/custom_part_dialogs.ycp"; + include "partitioning/custom_part_check_generated.ycp"; void Debug(string text, any value) @@ -49,7 +64,7 @@ UI::ChangeWidget(`id(`table), `CurrentItem, device); } - + include "partitioning/icons.ycp"; include "partitioning/ep-lib.ycp"; Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 15:19:42 2008 @@ -28,7 +28,11 @@ */ { - textdomain "storage"; + textdomain "storage"; + + + include "partitioning/ep-main.ycp"; + import "Arch"; import "Installation"; @@ -46,6 +50,7 @@ import "StorageDevices"; import "ProductFeatures"; + include "partitioning/partition_defines.ycp"; include "partitioning/nfs.ycp"; include "partitioning/lvm_ui_dialogs.ycp"; @@ -54,7 +59,7 @@ include "partitioning/custom_part_lib.ycp"; include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_check_generated.ycp"; - include "partitioning/ep-main.ycp"; + boolean edit_cylinder = true; @@ -886,7 +891,7 @@ // %2 is replaced by disk label name (e.g. msdos, gpt) string text = sformat( _(" The value of the end cylinder %1 was not valid. -The used disk label %2 does not support partitions above +The used disk label %2 does not support partitions above the size of %3. Therefore, the cylinder value must be below %4. @@ -1095,7 +1100,7 @@ integer check_size = retval["size_k"]:0 * 1024; if( is_disk ) check_size = retval["region",1]:0 * cyl_size; - + if( !check_ok_fssize( check_size, retval )) { UI::SetFocus(`id(`end_part)); -- 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] r49821 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 15:09:42 2008 New Revision: 49821 URL: http://svn.opensuse.org/viewcvs/yast?rev=49821&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 15:09:42 2008 @@ -1852,16 +1852,6 @@ - string help_text = ""; - if( Arch::s390 () ) - { - help_text = getMainHelptextS390(); - } - else - { - help_text = getMainHelptext(Stage::initial()); - } - // Main dialog: Header string back_label = ""; @@ -1878,10 +1868,6 @@ Wizard::HideAbortButton(); } - // heading text - // Wizard::SetContentsButtons(_("Expert Partitioner"), contents, help_text, - // back_label, next_label ); - ////////////////////////////////////////////////////////////////// //// Loop for User Input .... @@ -2088,7 +2074,6 @@ - Wizard::RestoreHelp( help_text ); SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_e"), Storage::GetTargetMap() ); -- 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] r49820 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 15:05:58 2008 New Revision: 49820 URL: http://svn.opensuse.org/viewcvs/yast?rev=49820&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 15:05:58 2008 @@ -61,20 +61,6 @@ boolean bsd_label = false; - boolean button_resize = true; // Should the "Resize Partition"-Button be shown in main window - boolean button_create = true; // Should the "Create Partition"-Button be shown in main window - boolean button_delete = true; // Should the "Delete Partition"-Button be shown in main window - boolean button_edit = true; // Should the "Edit Partition"-Button be shown in main window - boolean button_reread = true; // Should the "Reread Partition"-Button be shown in Expert menu - boolean button_raid = true; // Should the "RAID" -Button be shown in main window - boolean button_loop = true; // Should the "LOOP" -Button be shown in main window - boolean button_nfs = true; // Should the "NFS" -Button be shown in main window - boolean button_lvm = true; // Should the "LVM" -Button be shown in main window - boolean button_expert = true; // Should the "EXPERT"-Button be shown in main window - boolean button_delete_parttable = true; // Should the "Delete partition table and disk label" - // -Button be shown in Expert menu - - boolean test_mode = Mode::test (); string focusline = ""; -- 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] r49819 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 15:01:56 2008 New Revision: 49819 URL: http://svn.opensuse.org/viewcvs/yast?rev=49819&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 15:01:56 2008 @@ -1907,154 +1907,15 @@ ret = (symbol)Wizard::UserInput(); - /////////////////////////////////////////////////////////////// - //// EDIT - /////////////////////////////////////////////////////////////// - if( ret == `edit || ret == `table ) - { - map<string,any> part = $[]; - string id = ""; - id = (string)UI::QueryWidget(`id(`table), `CurrentItem); - - // notify a line is selected - if( id != nil ) - { - focusline = id; - if( !haskey( tg, id ) ) - part = Storage::GetPartition( tg, id ); - - y2milestone( "current partition %1", part ); - - if( size(part)==0 ) - { - if( tg[id,"type"]:`CT_UNKNOWN == `CT_LVM ) - { - ret = `lvm; - } - else - { - } - } - else if( part["type"]:`unknown == `lvm ) - { - HandleEditLv( tg, id ); - } - else if( part["type"]:`unknown == `sw_raid ) - { - } - else if( part["type"]:`unknown == `evms ) - { - } - else if( part["type"]:`unknown == `loop ) - { - ret = `loop_edit; - } - else if( part["type"]:`unknown == `nfs ) - { - ret = `nfs_edit; - } - else - { - map new_val = $[]; - map<string,any> disk = Storage::GetDisk( tg, id ); - ///////////////////////////////////////////////////// - // check if the partition can be deleted - - if( !check_device_edit( part, bsd_label)) - { - ret = `again; - continue; - } - - list<map> partitions_without_current = - filter( map p, disk["partitions"]:[], - ``(p["nr"]:(any)0!=part["nr"]:(any)0 )); - - map<string,any> disk_without_current = - add( disk, "partitions", partitions_without_current); - ////////////////////////////////////// - // There are three different Editors: - // - "normal" - // - extended - // - already existing - - if( part["type"]:`primary == `extended ) - { - if( part["create"]:false ) - { - // header of the dialog edit a partition - string title = _("Edit an Extended Partition") + - " " + part["device"]:""; - new_val = CreateEditExtendedPartDlg( part, - title, - part["device"]:"", - disk_without_current, - disk["cyl_size"]:1000000, - true, - bsd_label - ); - } - else - { - // error popup text - Popup::Error( _("An already-existing extended partition cannot be changed. + // TODO: check in redesign + /* + Popup::Error( _("An already-existing extended partition cannot be changed. Delete this partition then create a new one using the new parameters. All data on this partition will be lost if you delete it.")); - new_val = nil; - } - } - else - { - string title = ""; - if( !part["create"]:false ) - { - // header of the dialog to edit a partition %1 is replaced by device name (e.g. /dev/hda1) - title = sformat( _("Edit Existing Partition %1"), - part["device"]:"" ); - if( part["type"]:`primary != `primary && - part["type"]:`primary != `logical ) - title = sformat( _("Edit Existing Device %1"), - part["device"]:"" ); - } - else - { - // header of the dialog to edit a partition %1 is replaced by device name (e.g. /dev/hda1) - - title = sformat( _("Edit Partition %1"), - part["device"]:"" ); - } + */ - new_val = - EditOrCreatePartDlg( part, - FileSystems::GetAllFileSystems(true, true) , - title, - disk_without_current, - bsd_label, edit_cylinder, - disk["cyl_size"]:1000000, - Stage::initial() ); - } - if( new_val != nil && size(new_val)>0 ) // not canceld - { - if( new_val["create"]:false ) - Storage::UpdatePartition( new_val["device"]:"", - new_val["region",0]:0, - new_val["region",1]:0 ); - if( !disk["readonly"]:false && - part["fsid"]:0!=new_val["fsid"]:Partitions::fsid_native ) - Storage::SetPartitionId( new_val["device"]:"", - new_val["fsid"]:Partitions::fsid_native ); - Storage::ChangeVolumeProperties( new_val ); - } - } - } - else - { - // popup text - Popup::Message(_("Select the partition to edit in the main dialog.") ); - } - } ///////////////////////////////////////////////////////////// // RESIZE -- 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] r49818 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 14:57:49 2008 New Revision: 49818 URL: http://svn.opensuse.org/viewcvs/yast?rev=49818&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 14:57:49 2008 @@ -2160,82 +2160,6 @@ } } - boolean ask_reread = true; - - ///////////////////////////////////////////////////////////// - // Delete partition table and disk label - ///////////////////////////////////////////////////////////// - - if( Arch::s390 () && ret==`dasdfmt ) - { - string id = (string)UI::QueryWidget(`id(`table), `CurrentItem); - map disk = tg[id]:$[]; - - y2milestone( "dasdfmt disk:%1", id ); - - if( haskey( tg, id ) && search( id, "/dev/dasd")==0 ) - { - if( !disk["dasdfmt"]:false) - { - // popup text %1 is replaced by a dasd name e.g. /dev/dasda - boolean yn = Popup::YesNo(sformat( -_("Running dasdfmt deletes all data on the disk. -Really execute dasdfmt on disk %1? -"),id)); - y2milestone( "yn=%1", yn ); - if( yn ) - { - Storage::InitializeDisk( id, true ); - } - } - else - { - Popup::Message( _("The disk is no longer marked for dasdfmt. - -Partitions currently present on this disk are again -displayed. -") ); - Storage::InitializeDisk( id, false ); - } - } - else - { - // popup text - Popup::Error( _("No DASD disk selected. -Select the DASD disk on which dasdfmt should be executed.")); - } - } - - if( ret==`iscsi ) - { - boolean changed = - !Storage::EqualBackupStates( "custom_part", "", true ); - if( changed ) - { - // popup text - if( Popup::YesNo(_("Calling iSCSI configuration cancels all current changes. -Really do this?"))) - changed = false; - } - - if( !changed ) - { - if( !Mode::normal() || Package::InstallAll( ["yast2-iscsi-client"] )) - { - WFM::call( "iscsi-client" ); - UI::OpenDialog( `opt(`decorated), - `VBox( - `VSpacing(1), - `HBox(`HSpacing(1), - `Label(_("Rereading disk information...")), - `HSpacing(1)), - `VSpacing(1))); - Storage::ReReadTargetMap(); - UI::CloseDialog(); - } - } - } - ///////////////////////////////////////////////////////////// // End of Actions, Now check the returncode ///////////////////////////////////////////////////////////// -- 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] r49817 - in /trunk/storage/storage/src: inst_custom_part.ycp modules/Storage.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 14:56:03 2008 New Revision: 49817 URL: http://svn.opensuse.org/viewcvs/yast?rev=49817&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/inst_custom_part.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 14:56:03 2008 @@ -57,7 +57,6 @@ include "partitioning/ep-main.ycp"; - boolean show_disk = true; boolean edit_cylinder = true; boolean bsd_label = false; @@ -76,7 +75,6 @@ // -Button be shown in Expert menu boolean test_mode = Mode::test (); - string boot_mode = "fritz"; string focusline = ""; @@ -1906,34 +1904,9 @@ repeat { map<string,map> tg = Storage::GetTargetMap(); - // table_list = FillPartitionList(tg); - // UI::ChangeWidget(`id(`table), `Items, table_list); - - /////////////////////////////////////////////////////// - // Now set the focus - // (only for "show_disk" cause I use the disk line) - - if( show_disk ) - { - UI::SetFocus( `id(`table)); - focusline = Storage::GetLastUsed(); - y2milestone( "focusline %1", focusline ); - if( size(focusline)>0 ) - { - UI::ChangeWidget(`id(`table), `CurrentItem, focusline); - } - } ret = (symbol)Wizard::UserInput(); - y2milestone( "USERINPUT: %1", ret); - - if( ret==`show_table_details ) - { - continue; - } - - /////////////////////////////////////////////////////////////// //// EDIT /////////////////////////////////////////////////////////////// @@ -2084,14 +2057,6 @@ } ///////////////////////////////////////////////////////////// - // DELETE - ///////////////////////////////////////////////////////////// - if (ret == `delete) - { - } - - - ///////////////////////////////////////////////////////////// // RESIZE ///////////////////////////////////////////////////////////// if (ret == `resize) @@ -2336,8 +2301,6 @@ } } - Storage::SetLastUsed( focusline ); - y2milestone( "end main loop ret %1 focusline %2", ret, focusline ); } until (ret == `next || ret == `back || ret == `cancel || ret == `raid_wizard || ret == `raid_settings || Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Aug 7 14:56:03 2008 @@ -279,7 +279,6 @@ symbol custom_key = `custom; boolean probe_done = false; symbol exit_key = `next; - string last_used = ""; any sint = nil; list<map> conts = []; @@ -1929,16 +1928,6 @@ return( exit_key ); }; -global define void SetLastUsed( string device ) - { - if( size(device)>0 ) - last_used = device; - } - -global define string GetLastUsed() - { - return( last_used ); - } /** * Finds and returns fstab entry -- 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] r49816 - /trunk/storage/storage/src/include/ep-lvm-lib.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 14:38:10 2008 New Revision: 49816 URL: http://svn.opensuse.org/viewcvs/yast?rev=49816&view=rev Log: - fixed setting of volume properties during creation of logical volumes Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Thu Aug 7 14:38:10 2008 @@ -176,6 +176,9 @@ if (DlgCreateLogicalVolume(data)) { + // ChangeVolumeProperties and thus addLogicalVolume need the device name + data["device"] = device + "/" + data["name"]:""; + Debug("create lv from data", data); addLogicalVolume(data, substring(device, 5)); -- 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] r49815 - /trunk/libyui-bindings/swig/python/examples/widgets.py
by kkaempf＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: kkaempf Date: Thu Aug 7 14:08:36 2008 New Revision: 49815 URL: http://svn.opensuse.org/viewcvs/yast?rev=49815&view=rev Log: Example of using multiple widgets Added: trunk/libyui-bindings/swig/python/examples/widgets.py Added: trunk/libyui-bindings/swig/python/examples/widgets.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui-bindings/swig/python/exam… ============================================================================== --- trunk/libyui-bindings/swig/python/examples/widgets.py (added) +++ trunk/libyui-bindings/swig/python/examples/widgets.py Thu Aug 7 14:08:36 2008 @@ -0,0 +1,156 @@ +#coding:utf-8 +############################################################################# +# +# widgets.py - Demonstration of widgets available in python-libyui +# +# License: GPLv2 +# Author: Jan-Simon MÃ¶ller, dl9pf(a)gmx.de +############################################################################# + +########### +# imports # +########### +import yui +import locale + + +#################################### +# LOCALE (important for TERMINAL!) # +#################################### +# set the locale to $ENV +locale.setlocale(locale.LC_ALL, "") + +################# +# class widgets # +################# +class WIDGETS(object): + """ + Main class for the 'widgets' demo + """ + + def __init__(self, myavwidgets): + """ + Init/Constructor for the 'widgets' demo + """ + self.factory = yui.YUI.widgetFactory() + self.dialog = self.factory.createMainDialog() + self.avwidgets = myavwidgets.copy() + # create the main gui + # +---+-----------+ + # | s | display | + # | e +-----------+ + # | l |description| + # | b +-----------+ + # | x | code | + # +---+-----------+ + self.mainhbox = self.factory.createHBox(self.dialog) + self.selbox = self.factory.createSelectionBox(self.mainhbox, "Widgets") + self.selbox.setWeight(0,20) + self.selbox.setNotify() + self.boxright = self.factory.createVBox(self.mainhbox) + self.boxright.setWeight(0,80) + self.framedisplay = self.factory.createFrame(self.boxright, "View") + self.framedisplay.setWeight(1,33) + self.framedisplay.setStretchable(0,True) + self.display = self.factory.createReplacePoint(self.framedisplay) # here we change the widget + self.displaychild_ = {} + self.framedescription = self.factory.createFrame(self.boxright, "Description") + self.framedescription.setWeight(1,33) + self.framedescription.setStretchable(0,True) + self.description = self.factory.createReplacePoint(self.framedescription) # here we change the widget + self.descriptionchild_ = {} + self.framecode = self.factory.createFrame(self.boxright, "Code") + self.framecode.setWeight(1,33) + self.framecode.setStretchable(0,True) + self.code = self.factory.createReplacePoint(self.framecode) # here we change the widget + self.codechild_ = {} + self.updateselbox() # import available widgets into display + self.updatedisplay() + self.updatedescription() + self.updatecode() + + def updateselbox(self): + for i in self.avwidgets.keys(): + self.selbox.addItem(i) + + def updatedisplay(self): + self.display.deleteChildren() # remove old widgets + selected = self.selbox.selectedItem().label() + #self.displaychild_[selected] = self.factory.createPushButton(self.display, "&OK") #self.avwidgets[selected][0] + #print type(self.displaychild_[selected]) + widgettodisplay = "self.displaychild_[selected] = self.factory."+self.avwidgets[selected][0] + exec widgettodisplay + if self.avwidgets[selected][1]: + widgettodisplay1 = "self.displaychild_[selected]"+self.avwidgets[selected][1] + exec widgettodisplay1 + if self.avwidgets[selected][2]: + widgettodisplay2 = "self.displaychild_[selected]"+self.avwidgets[selected][2] + exec widgettodisplay2 + self.dialog.recalcLayout() + self.display.showChild() + + def updatedescription(self): + self.description.deleteChildren() + selected = self.selbox.selectedItem().label() + text = self.avwidgets[selected][3] + self.descriptionchild_[selected] = self.factory.createRichText(self.description, str(text)) + #exec widgettodescribe + self.dialog.recalcLayout() + self.description.showChild() + + def updatecode(self): + self.code.deleteChildren() + selected = self.selbox.selectedItem().label() + text = self.avwidgets[selected][4] + print text + self.codechild_[selected] = self.factory.createRichText(self.code, str(text)) + self.dialog.recalcLayout() + self.code.showChild() + + + def handleevent(self): + """ + Event-handler for the 'widgets' demo + """ + while True: + event = self.dialog.waitForEvent() + if event.eventType() == yui.YEvent.CancelEvent: + self.dialog.destroy() + break + if event.widget() == self.selbox: + self.updatedisplay() + self.updatedescription() + self.updatecode() + +if __name__ == "__main__": + avwidgets = {} + avwidgets["PushButton"]=['createPushButton(self.display, "&OK")', + None, + None, + """This Widget is a Button with a name and a configurable shortcut""", + """Code: myPushButton = factory.createPushButton(parentWidget, Name) e.g. myPushButton = f.createPushButton(myHBox, "&OK")"""] + avwidgets["ComboBox"] =['createComboBox(self.display, "Combobox")', + '.addItem("Item1")' , + '.addItem("Item2")' , + """This Widget is a Combobox with 1 or more items.""", + """Code: + myComboBox = factory.createComboBox(parentWidget, "Name") + myComboBox.addItem("Item") + + Event: + if event.widget == myComboBox: + dosomething() """] + avwidgets["InputField"]=['createInputField(self.display, "Inputfield")', + '.setValue("Input nonsense here")', + None, + """This Widget is an InputField for User-Input""", + """Code: + myInputField = factory.createInputField(parentWidget, "Name") + myInputField.setValue("Insert valid input here") + myInputField.setValidChars("abcdefghijklmnopqrstuvwxyz") + Event: + if event.widget = myInputField: + value = myInputField.value() + """] + MY_MAIN_GUI = WIDGETS(avwidgets) + MY_MAIN_GUI.handleevent() \ No newline at end of file -- 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] r49814 - in /trunk/libyui-bindings: CMakeLists.txt libyui-bindings.spec.cmake package/libyui-bindings.changes swig/perl/CMakeLists.txt swig/python/CMakeLists.txt swig/ruby/examples/hello_world.rb
by kkaempf＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: kkaempf Date: Thu Aug 7 14:00:49 2008 New Revision: 49814 URL: http://svn.opensuse.org/viewcvs/yast?rev=49814&view=rev Log: Fix Python 2.6: - use py_sitedir macro for rpm %files, pass to build - use py_requires Fix future Perl: - use versioned perl requires Modified: trunk/libyui-bindings/CMakeLists.txt trunk/libyui-bindings/libyui-bindings.spec.cmake trunk/libyui-bindings/package/libyui-bindings.changes trunk/libyui-bindings/swig/perl/CMakeLists.txt trunk/libyui-bindings/swig/python/CMakeLists.txt trunk/libyui-bindings/swig/ruby/examples/hello_world.rb Modified: trunk/libyui-bindings/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui-bindings/CMakeLists.txt?r… ============================================================================== --- trunk/libyui-bindings/CMakeLists.txt (original) +++ trunk/libyui-bindings/CMakeLists.txt Thu Aug 7 14:00:49 2008 @@ -59,9 +59,9 @@ SET( SRCPACKAGE_COMMAND COMMAND ${CMAKE_MAKE_PROGRAM} package_source - COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package/ - COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes" + COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/package/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 + COMMAND ${CMAKE_COMMAND} -E move ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes ${CMAKE_BINARY_DIR}/package ) ADD_CUSTOM_TARGET( srcpackage_local Modified: trunk/libyui-bindings/libyui-bindings.spec.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui-bindings/libyui-bindings.… ============================================================================== --- trunk/libyui-bindings/libyui-bindings.spec.cmake (original) +++ trunk/libyui-bindings/libyui-bindings.spec.cmake Thu Aug 7 14:00:49 2008 @@ -24,6 +24,7 @@ BuildRequires: cmake gcc-c++ ruby-devel perl python-devel swig BuildRequires: yast2-libyui-devel >= 2.16 Source: %{name}-%{version}.tar.bz2 +Prefix: /usr %description - @@ -36,6 +37,7 @@ cd build cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ -DLIB=%{_lib} \ + -DPYTHON_SITEDIR=%{py_sitedir} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ @@ -59,6 +61,7 @@ - %package -n python-yui +%py_requires Summary: Python bindings for yast2-libyui Group: Development/Languages/Python @@ -66,7 +69,7 @@ - %package -n perl-yui -Requires: perl-base = 5.10.0 +Requires: perl = %{perl_version} Summary: Perl bindings for yast2-libyui Group: Development/Languages/Perl @@ -81,13 +84,13 @@ %files -n python-yui %defattr(-,root,root,-) %doc swig/python/examples/*.py -%{_libdir}/python2.5/site-packages/_yui.so -%{_libdir}/python2.5/site-packages/yui.py +%{py_sitedir}/_yui.so +%{py_sitedir}/yui.py %files -n perl-yui %defattr(-,root,root,-) %doc swig/perl/examples/*.pl -/usr/lib/perl5/vendor_perl/*/*/yui.so -/usr/lib/perl5/vendor_perl/*/yui.pm +%{perl_vendorarch}/yui.so +%{perl_vendorlib}/yui.pm %changelog Modified: trunk/libyui-bindings/package/libyui-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui-bindings/package/libyui-b… ============================================================================== --- trunk/libyui-bindings/package/libyui-bindings.changes (original) +++ trunk/libyui-bindings/package/libyui-bindings.changes Thu Aug 7 14:00:49 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 7 13:45:16 CEST 2008 - kkaempf(a)suse.de + +- use rpm macros for Perl and Python directories. Fixes building + against Python 2.6. + +------------------------------------------------------------------- Fri May 23 15:19:27 CEST 2008 - kkaempf(a)suse.de - fix widget (pointer) comparison for Perl and Python. Modified: trunk/libyui-bindings/swig/perl/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui-bindings/swig/perl/CMakeL… ============================================================================== --- trunk/libyui-bindings/swig/perl/CMakeLists.txt (original) +++ trunk/libyui-bindings/swig/perl/CMakeLists.txt Thu Aug 7 14:00:49 2008 @@ -18,8 +18,7 @@ MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") MESSAGE(STATUS "Perl core dir: ${PERL_CORE_DIR}") -MESSAGE(STATUS "Perl vendor arch dir: ${PERL_VENDOR_ARCH}") -MESSAGE(STATUS "Perl vendor lib dir: ${PERL_VENDOR_LIB}") +MESSAGE(STATUS "Perl vendor arch dir: ${PERL_VENDORDIR}") ADD_DEFINITIONS( ${PERL_CCFLAGS} -Wno-unused -Wno-error ) LINK_DIRECTORIES( ${PERL_CORE_DIR} ) Modified: trunk/libyui-bindings/swig/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui-bindings/swig/python/CMak… ============================================================================== --- trunk/libyui-bindings/swig/python/CMakeLists.txt (original) +++ trunk/libyui-bindings/swig/python/CMakeLists.txt Thu Aug 7 14:00:49 2008 @@ -14,9 +14,13 @@ FIND_PACKAGE(PythonInterp) EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.path[2])" OUTPUT_VARIABLE PYTHON_LIB_DIR) +IF (NOT PYTHON_SITEDIR) +SET (PYTHON_SITEDIR ${PYTHON_LIB_DIR}/site-packages) +ENDIF (NOT PYTHON_SITEDIR) + MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") MESSAGE(STATUS "Python lib dir: ${PYTHON_LIB_DIR}") -MESSAGE(STATUS "Python site dir: ${PYTHON_LIB_DIR}/site-packages") +MESSAGE(STATUS "Python site dir: ${PYTHON_SITEDIR}") ADD_CUSTOM_COMMAND ( OUTPUT ${SWIG_OUTPUT} @@ -39,6 +43,6 @@ TARGET_LINK_LIBRARIES( yui_python ${LIBYUI_LIBRARY} ) TARGET_LINK_LIBRARIES( yui_python ${PYTHON_LIBRARIES} ) -INSTALL(TARGETS yui_python LIBRARY DESTINATION ${PYTHON_LIB_DIR}/site-packages) +INSTALL(TARGETS yui_python LIBRARY DESTINATION ${PYTHON_SITEDIR}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/yui.py DESTINATION ${PYTHON_LIB_DIR}/site-packages ) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/yui.py DESTINATION ${PYTHON_SITEDIR} ) Modified: trunk/libyui-bindings/swig/ruby/examples/hello_world.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui-bindings/swig/ruby/exampl… ============================================================================== --- trunk/libyui-bindings/swig/ruby/examples/hello_world.rb (original) +++ trunk/libyui-bindings/swig/ruby/examples/hello_world.rb Thu Aug 7 14:00:49 2008 @@ -12,7 +12,7 @@ factory = Yui::YUI::widget_factory dialog = factory.create_popup_dialog vbox = factory.create_vbox dialog - factory.create_label vbox, "Hello, World!" + factory.create_label vbox, "Hello, WÃ¶rld!" factory.create_push_button vbox, "&OK" event = dialog.wait_for_event dialog.destroy -- 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] r49813 - /trunk/storage/storage/src/modules/StorageFields.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 12:36:08 2008 New Revision: 49813 URL: http://svn.opensuse.org/viewcvs/yast?rev=49813&view=rev Log: - don't show fs-type in type field since we have separate fs-type field Modified: trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Thu Aug 7 12:36:08 2008 @@ -324,12 +324,6 @@ else { value = part["fstype"]:""; - if (part["format"]:false && part["fsid"]:0 == Partitions::fsid_native) - { - symbol used_fs = part["used_fs"]:`unknown; - string fs_name = FileSystems::GetName(used_fs, "Ext2"); - value = value + " (" + fs_name + ") "; - } } if (style == `table) return value; -- 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] r49812 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 12:08:52 2008 New Revision: 49812 URL: http://svn.opensuse.org/viewcvs/yast?rev=49812&view=rev Log: - removed stupid, annoying and obtrusive id line Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 12:08:52 2008 @@ -26,8 +26,6 @@ * ************************************************************* - $Id$ - */ { textdomain "storage"; -- 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] r49811 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 12:04:36 2008 New Revision: 49811 URL: http://svn.opensuse.org/viewcvs/yast?rev=49811&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 12:04:36 2008 @@ -1770,120 +1770,6 @@ }; - /*--------------------------------------------------------------------- - * Dialog choose disk - * return /dev/xxx or nil if cancel - * what -> `create or `delete - *--------------------------------------------------------------------- - */ - -boolean SelDisk( symbol what, map disk ) - { - return( (what==`delete||!disk["readonly"]:false) && - Storage::IsPartitionable( disk ) && - disk["used_by_type"]:`UB_NONE==`UB_NONE ); - } - - -define term RaidButton( integer num ) - ``{ - list item_list = []; - item_list = add( item_list, - // menue entry text - `item( `id(`raid_wizard), _("&Create RAID...") )); - if( num>0 ) - item_list = add( item_list, - // menu entry text - `item( `id(`raid_settings), _("&Edit RAID"))); - // button text - return( `MenuButton( _("&RAID...") , item_list )); - }; - -define term LoopButton( integer num ) - ``{ - list item_list = []; - item_list = add( item_list, - // menue entry text - `item( `id(`loop_create), _("&Create Crypt File") )); - if( num>0 ) - item_list = add( item_list, - // menue entry text - `item( `id(`loop_edit), _("&Edit Crypt File"))); - // button text - return( `MenuButton( _("Cr&ypt File...") , item_list )); - }; - - - - /*--------------------------------------------------------------------- - * Dialog choose primary extended or logical Partition - * Input "PL", "PE" or "PEL" - * return `primary or `logical or `extended or `none - *--------------------------------------------------------------------- - */ - -define symbol ChoosePart( string usage ) - ``{ - term PL = `VBox( - // button text - `Left( `RadioButton( `id(`primary ), _("&Primary Partition"), true )), - // button text - `Left( `RadioButton( `id(`logical ), _("&Logical Partition"), false )) - ); - term PE = `VBox( - // button text - `Left( `RadioButton( `id(`primary ), _("&Primary Partition"), true )), - // button text - `Left( `RadioButton( `id(`extended ), _("&Extended Partition"), false )) - ); - term PEL = `VBox( - // button text - `Left( `RadioButton( `id(`primary ), _("&Primary Partition"), true )), - // button text - `Left( `RadioButton( `id(`logical ), _("&Logical Partition"), false )), - // button text - `Left( `RadioButton( `id(`extended ), _("&Extended Partition"), false )) - ); - - term current = PEL; // default - if ( usage == "PL" ) current = PL; - if ( usage == "PE" ) current = PE; - - UI::OpenDialog( `opt(`decorated ), - // heading in a popup dialog - `VBox(`Heading(_("Partition Type") ), - `VSpacing(0.5), - `RadioButtonGroup( `id(`choosePL), current ), - `VSpacing(0.5), - `HBox( - // popup edit existing partition: OK - `PushButton(`id(`ok), `opt(`default), Label::OKButton() ), - // popup edit existing partition: Cancel - `PushButton(`id(`cancel), Label::CancelButton() ) - ) - ) - ); - symbol ret = (symbol)UI::UserInput(); - - if (ret == `cancel) - { - UI::CloseDialog(); - return(`none); - } - else - { - ret = (symbol)UI::QueryWidget(`id(`choosePL), `CurrentButton); - UI::CloseDialog(); - return(ret); - } - }; - - - /*--------------------------------------------------------------------- - * Make a output string for "you can not create a partition, because: " - *--------------------------------------------------------------------- - */ - define string FormatCauseLine( symbol cause ) ``{ @@ -1982,99 +1868,7 @@ Storage::CreateTargetBackup("custom_part"); } - ///////////////////////////////////////////////////////////////// - /// MAIN DIALOG - - - ///////////////////////////////////////////////////////////////// - // MAIN LAYOUT - // --------------------------- - - term buttonline_a = `HBox(); - - // main dialog: Button Create partition - if( button_create ) - buttonline_a = add( buttonline_a, - `PushButton(`id(`create), _("&Create")) ); - - // main dialog: Button Edit partition - if( button_edit ) - buttonline_a = add( buttonline_a, `PushButton(`id(`edit), _("&Edit"))); - - // main dialog: Button Delete partition - if( button_delete ) - buttonline_a = add( buttonline_a, - `PushButton(`id(`delete), _("&Delete")) ); - - // main dialog: Button Resize partition - if( button_resize ) - buttonline_a = add( buttonline_a, - `PushButton(`id(`resize), _("Re&size")) ); - - - - list expert_item_list =[]; - if( button_reread ) - expert_item_list = - add( expert_item_list , - // menu entry text - `item( `id (`reread), _("&Reread Partition Table"))); - if ( button_delete_parttable ) - expert_item_list = - add( expert_item_list, - `item( `id (`delete_parttable), - // menu entry text - _("Delete Partition &Table and Disk Label"))); - if( Arch::s390 () ) - { - expert_item_list = - add( expert_item_list, - `item( `id(`dasdfmt), - // menu entry text - _("Execute dasd&fmt on the DASD Device"))); - buttonline_a = add( buttonline_a, `PushButton(`id(`dasdfmt), - //button text using case-senstive command name. dasdfmt should not normally be translated. - _("dasd&fmt")) ); - } - expert_item_list = - add( expert_item_list, `item( `id(`iscsi), - // menu entry text - _("Call &iSCSI configuration"))); - - term buttonline_b = `HBox(); - - if( button_lvm ) - // main dialog: Button LVM - buttonline_b = add( buttonline_b, `PushButton(`id(`lvm), _("&LVM..."))); - - // main dialog: Button RAID - if( button_raid ) - buttonline_b = - add( buttonline_b, - `ReplacePoint( `id(`raid_button), - RaidButton(size(tg["/dev/md","partitions"]:[])))); - - // main dialog: Button LOOP - if( button_loop ) - buttonline_b = - add( buttonline_b, - `ReplacePoint( `id(`loop_button), - LoopButton(size(tg["/dev/loop","partitions"]:[])))); - - if( button_nfs ) - buttonline_b = add( buttonline_b, `PushButton(`id(`nfs), _("&NFS..."))); - - if( button_expert) - // main dialog: Menu-Button for Expert options - buttonline_b = - add( buttonline_b, `MenuButton ( _("E&xpert.."), expert_item_list )); - - - // check box - term details_checkbox = `Left ( - `CheckBox (`id(`show_table_details), `opt(`notify), _("&Show Details")) - ); string help_text = ""; if( Arch::s390 () ) -- 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] r49810 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 11:59:00 2008 New Revision: 49810 URL: http://svn.opensuse.org/viewcvs/yast?rev=49810&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 11:59:00 2008 @@ -81,46 +81,6 @@ string boot_mode = "fritz"; string focusline = ""; - string last_sel_disk = ""; - - - - - //////////////////////////////////////////////// - // Testmode, should be commented in release - // test_mode = true; - // test_mode = false; - // Arch::architecture () = "ppc"; - // Arch::architecture () = "axp"; - //////////////////////////////////////////////// - - if( Arch::ppc () ) - { - bsd_label = false; - } - - if( Arch::s390 () ) - { - button_resize = false; - button_loop = false; - } - - if( Arch::alpha () ) - { - bsd_label = (boot_mode == "aboot"); - } - - if( Arch::sparc () ) - { - bsd_label = true; - } - - - - //////////////////////////////////////////////////////////////////////// - // DEFINES // - //////////////////////////////////////////////////////////////////////// - /*--------------------------------------------------------------------- @@ -1824,108 +1784,6 @@ disk["used_by_type"]:`UB_NONE==`UB_NONE ); } -define string ChooseDisk( map<string,map> targetMap, string heading, symbol what ) - ``{ - // Header Choose disk dialog - term diskgroup = `VBox(); - list<string> disks = []; - integer n = 0; - string txt = ""; - - y2milestone( "ChooseDisk last_sel_disk:%1 what:%2", last_sel_disk, what ); - - disks = maplist( string dv, map ds, - filter( string dev, map disk, targetMap, - ``(SelDisk(what,disk))), - ``(dv)); - y2milestone( "ChooseDisk disks:%1", disks ); - disks = (list<string>) - merge( filter( string d, disks, ``(search(d,"/dev/mapper/")==0)), - filter( string d, disks, ``(search(d,"/dev/mapper/")!=0)) ); - y2milestone( "ChooseDisk disks:%1", disks ); - foreach( string dev, disks, - ``{ - txt = sformat( "&%1: %2", n+1, dev ); - diskgroup = add( diskgroup, `Left( `RadioButton( `id(dev), txt, - dev==last_sel_disk ))); - n = n + 1; - }); - if( size(disks)>10 ) - { - diskgroup = `VBox( `SelectionBox( `id(`disklist), _("Available &Disks"), - disks )); - } - else - { - diskgroup = `RadioButtonGroup( `id(`choosedisk), diskgroup ); - } - - if( size(disks) > 1 ) - { - UI::OpenDialog( `opt(`decorated), `VBox(`Heading( heading ), - `VSpacing(0.5), - diskgroup, - `VSpacing(0.5), - `HBox( - // popup edit existing partition: OK - `PushButton(`id(`ok), `opt(`default), Label::OKButton() ), - // popup edit existing partition: Cancel - `PushButton(`id(`cancel), Label::CancelButton() ) - ) - ) - ); - if( UI::WidgetExists( `id(`disklist) )) - { - UI::ChangeWidget( `id(`disklist), `CurrentItem, last_sel_disk ); - } - symbol ret = (symbol)UI::UserInput(); - - if( ret == `cancel) - { - UI::CloseDialog(); - return( nil ); - } - else - { - string r = ""; - y2milestone( "ChooseDisk exits %1", UI::WidgetExists( `id(`disklist)) ); - if( !UI::WidgetExists( `id(`disklist) )) - { - r = (string)UI::QueryWidget(`id(`choosedisk), `CurrentButton); - } - else - { - r = (string)UI::QueryWidget(`id(`disklist), `CurrentItem); - } - y2milestone( "ChooseDisk r %1", r ); - UI::CloseDialog(); - n=0; - if( what==`create && targetMap[r,"readonly"]:false ) - { - Popup::Error( Partitions::RdonlyText( r, true )); - return( nil ); - } - last_sel_disk = r; - y2milestone( "ChooseDisk last_sel_disk:%1", last_sel_disk ); - return(r); - } - } - else if( size(disks) == 1 ) - { - // if there is only one disk: no - return( disks[0]:"" ); - } - else if( size(disks) == 0 ) - { - string txt = _("There are no partitionable disks available."); - if( Arch::s390() ) - { - txt = txt + "\n" + _("You may use dasdfmt in Expert-Button to low level format disks."); - } - Popup::Error( txt ); - return( "" ); - } - }; define term RaidButton( integer num ) ``{ @@ -2284,251 +2142,6 @@ } - ///////////////////////////////////////////////////////////// - //// CREATE - ///////////////////////////////////////////////////////////// - else if( ret == `create) - { - string ddev = ChooseDisk( tg, - // popup text - _("Disk to Partition"), - `create ); - - if( ddev == nil || size(ddev)==0 ) - { - ret = `again; - continue; - } - - symbol create_type = `none; - map disk = tg[ddev]:$[]; - - list possibilities = CheckCreatePossibilities( ddev, disk ); - y2milestone( "possibilities %1", possibilities ); - - boolean primary_is_possible = possibilities[0]:false; - boolean extended_is_possible = possibilities[1]:false; - boolean logical_is_possible = possibilities[2]:false; - - symbol no_primary_cause = possibilities[3]:`no_space; - symbol no_extended_cause = possibilities[4]:`no_space; - symbol no_logical_cause = possibilities[5]:`no_space; - - list log_slot = []; - list p_e_slot = []; - - ////////////////////////////////////////////////////////// - // Test if there is space left on the device - log_slot = GetLogicalSlot(ddev, disk); - y2milestone( "log_slot %1", log_slot ); - p_e_slot = GetSlot(ddev, disk); - y2milestone( "p_e_slot %1", p_e_slot ); - - if ((log_slot == nil) && logical_is_possible ) - no_logical_cause = `no_space; - if ((p_e_slot == nil) && primary_is_possible ) - no_primary_cause = `no_space; - if ((p_e_slot == nil) && extended_is_possible) - no_extended_cause = `no_space; - - if (log_slot == nil) - logical_is_possible = false; - if (p_e_slot == nil) - primary_is_possible = false; - if (p_e_slot == nil) - extended_is_possible = false; - - - - /*---------------------------------------------------------------------- - * Intel/Fdisk PPC/Fdisk - * - * At the same time is not possible, that both "logial_part_is_possible" - * and "extended_part_is_possible" are true - * so we have 6 possible situations - * - * to show this we use - * "P" for primary_part_is_possible - * "E" for extended_part_is_possible - * "L" for logial_part_is_possible - * - * "p" for primary_part_is_possible == false - * "e" for extended_part_is_possible == false - * "l" for logial_part_is_possible == false - * - * - * PE : I can create a primary or exended part. - * PL : Extended part. exist. I can create a primary or a logical - * Pel : only a priary is possible, when the extended part. has no space left - * - * pE : Not possible, if "E" is possible always "P" is possible too. - * pL : only a logical is possible, if together 4 primary and extended - * partitions are already created - * pel : no partitions are possible - * - * -------------------------------------------------------------------- - * - * BSD-Labeling: - * "Pel" for primary_part_is_possible - * "pel" for primary_part_is_possible == false - * - *--------------------------------------------------------------------------*/ - - if( !primary_is_possible && !extended_is_possible && - !logical_is_possible ) - { - // ------pel-------- - string text = ""; - - if( disk["label"]:"msdos" != "msdos" ) - { - // popup text , %1 is replaced by a disk name e.g. /dev/hda - text = sformat( _("It is not possible to create a partition on %1."), ddev); - } - else - { - // popup text , %1 is replaced by a disk name e.g. /dev/hda - // %2 is replaced by an explanation - text = sformat( _("It is not possible to create a partition on %1. - -%2 -"), ddev, - FormatYouCannotCause( primary_is_possible, - extended_is_possible, - logical_is_possible, - no_primary_cause, - no_extended_cause, - no_logical_cause )); - } - Popup::Warning(text); - } - else if( !primary_is_possible && logical_is_possible ) - { - //------pL---------- - create_type = `logical; - } - else if( !primary_is_possible && extended_is_possible ) - { - //------pE---------- - create_type = `extended; - } - else if( primary_is_possible && !extended_is_possible && - !logical_is_possible ) - { - //------Pel---------- - create_type = `primary; - } - else if ( primary_is_possible && extended_is_possible ) - { - //------PE---------- - create_type = ChoosePart("PE"); // ddev - } - else if ( primary_is_possible && logical_is_possible ) - { - //------PL---------- - create_type = ChoosePart("PL"); // popup - } - else - { - y2error("Error during partition check" ); - create_type = ChoosePart("PEL"); // popup - } - - if( create_type != `none ) - { - list slot = (create_type!=`logical)?p_e_slot:log_slot; - y2milestone( "slot:%1", slot ); - map r = Storage::NextPartition( disk["device"]:"", - create_type ); - integer curr_nr = r["nr"]:0; - - //--------------------------------------------------- - // Present the Create-Popups ... - //--------------------------------------------------- - - string titleC = ""; - // Popup Create Partition: Description of partition %1 is for example "/dev/hda" - if ( create_type == `primary ) titleC = sformat( _(" Create a Primary Partition on %1 "), ddev ); - // Popup Create Partition: Description of partition %1 is for example "/dev/hda" - if ( create_type == `extended ) titleC = sformat( _(" Create an Extended Partition on %1 "), ddev ); - // Popup Create Partition: Description of partition %1 is for example "/dev/hda" - if ( create_type == `logical ) titleC = sformat( _(" Create a Logical Partition on %1 "), ddev ); - - map<string,any> new_val = - $[ - "create" : true, - "region" : [ slot[0]:0, slot[1]:0 - slot[0]:0+1 ], - "type" : create_type, - "nr" : curr_nr, - "device" : r["device"]:"" - ]; - - - if( create_type == `extended ) - { - new_val = (map<string,any>)union( new_val , - $[ - "fsid" : Partitions::fsid_extended_win, - "used_fs" : `unknown, - ]); - - new_val = - (map<string,any>)CreateEditExtendedPartDlg( new_val, - titleC, - ddev, - disk, - disk["cyl_size"]:1000000, - false, - bsd_label ); - } - else - { - string mount_point_proposal = - GetMountPointProposal( Storage::GetTargetMap(), [] ); - symbol used_fs = Partitions::DefaultFs(); - if( mount_point_proposal == Partitions::BootMount() ) - { - used_fs = Partitions::DefaultBootFs(); - } - new_val = - (map<string,any>)union( new_val, - $[ - "format" : true, - "fsid" : Partitions::fsid_native, - "mount" : mount_point_proposal, - "used_fs": used_fs, - ]); - - if( Mode::repair() ) - { - new_val["format"] = false; - new_val["mount" ] = ""; - } - - new_val = EditOrCreatePartDlg( new_val, - FileSystems::GetAllFileSystems(true, true ), - titleC, disk, - bsd_label, edit_cylinder, - disk["cyl_size"]:1000000, - Stage::initial() ); - } - - if (new_val != nil) - { - // set focus to new partition - focusline = new_val["device"]:""; - symbol mby = new_val["mountby"]:Storage::GetMountBy(new_val["device"]:""); - Storage::CreatePartition( disk["device"]:"", - new_val["device"]:"", - new_val["type"]:`primary, - new_val["fsid"]:Partitions::fsid_native, - new_val["region",0]:0, - new_val["region",1]:0, mby ); - Storage::ChangeVolumeProperties( new_val ); - } - } - } - /////////////////////////////////////////////////////////////// //// EDIT /////////////////////////////////////////////////////////////// -- 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] r49808 - /tags/stable-2_17_12/
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 11:27:40 2008 New Revision: 49808 URL: http://svn.opensuse.org/viewcvs/yast?rev=49808&view=rev Log: Created tag stable-2_17_12 Added: tags/stable-2_17_12/ -- 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] r49809 - /tags/stable-2_17_12/storage/
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 11:27:40 2008 New Revision: 49809 URL: http://svn.opensuse.org/viewcvs/yast?rev=49809&view=rev Log: Created tag stable-2_17_12 for storage Added: tags/stable-2_17_12/storage/ - copied from r49808, trunk/storage/ -- 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] r49807 - in /trunk/storage/libstorage: src/Lock.cc src/Lock.h src/Storage.cc testsuite/lib/limal_init.exp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 11:25:06 2008 New Revision: 49807 URL: http://svn.opensuse.org/viewcvs/yast?rev=49807&view=rev Log: - disable lock in testmode Modified: trunk/storage/libstorage/src/Lock.cc trunk/storage/libstorage/src/Lock.h trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/testsuite/lib/limal_init.exp 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 Thu Aug 7 11:25:06 2008 @@ -29,8 +29,8 @@ } - Lock::Lock(bool readonly) - : fd(-1), disabled(getenv("YAST2_STORAGE_NO_LOCKING") != NULL) + Lock::Lock(bool readonly, bool disable) + : fd(-1), disabled(disable || getenv("YAST2_STORAGE_NO_LOCKING") != NULL) { if (disabled) return; Modified: trunk/storage/libstorage/src/Lock.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.h?re… ============================================================================== --- trunk/storage/libstorage/src/Lock.h (original) +++ trunk/storage/libstorage/src/Lock.h Thu Aug 7 11:25:06 2008 @@ -38,7 +38,7 @@ public: - Lock(bool readonly); + Lock(bool readonly, bool disable = false); ~Lock() throw(); private: 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 Thu Aug 7 11:25:06 2008 @@ -75,7 +75,7 @@ Storage::Storage( bool ronly, bool tmode, bool autodetec ) - : lock(ronly), readonly(ronly), testmode(tmode), initialized(false), + : lock(ronly, tmode), readonly(ronly), testmode(tmode), initialized(false), autodetect(autodetec) { y2milestone( "constructed Storage ronly:%d testmode:%d autodetect:%d", Modified: trunk/storage/libstorage/testsuite/lib/limal_init.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/lib… ============================================================================== --- trunk/storage/libstorage/testsuite/lib/limal_init.exp (original) +++ trunk/storage/libstorage/testsuite/lib/limal_init.exp Thu Aug 7 11:25:06 2008 @@ -40,8 +40,6 @@ # run the test - setenv YAST2_STORAGE_NO_LOCKING - set result "" set oops [catch { set result [exec $src >$outfile 2>$errfile] } catched] -- 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] r49806 - in /trunk/storage/storage/src: include/ep-hd.ycp include/ep-lib.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: aschnell Date: Thu Aug 7 11:18:52 2008 New Revision: 49806 URL: http://svn.opensuse.org/viewcvs/yast?rev=49806&view=rev Log: - import mount points button Modified: trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/inst_custom_part.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 Thu Aug 7 11:18:52 2008 @@ -12,6 +12,7 @@ import "PackageCallbacks"; import "PackageSystem"; import "FileUtils"; + import "Mode"; import "Stage"; include "partitioning/ep-hd-dialogs.ycp"; @@ -55,7 +56,7 @@ if (Mode::installation()) { // push button text - buttons = add(buttons, `PushButton(`id(`fstab), _("Import Mount Points..."))); + buttons = add(buttons, `PushButton(`id(`import), _("Import Mount Points..."))); } buttons = add(buttons, `HStretch()); @@ -150,6 +151,13 @@ Really rescan disks?"), nil, nil); break; + case `import: + ImportMountPoints(); + Storage::CreateTargetBackup("expert-partitioner"); + UpdateNavigationTree(nil); + TreePanel::Create(); + break; + case `iscsi: // popup text CallConfig(_("Calling iSCSI configuration cancels all current changes. Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Thu Aug 7 11:18:52 2008 @@ -161,4 +161,37 @@ return false; } + + + void ImportMountPoints() + { + map<string,map> od = (map<string,map>)Storage::GetOndiskTarget(); + list<list> fstab = scanAndReadExistingFstab( od ); + y2milestone( "adapt_mp fstab %1", fstab ); + list ti = maplist( list e, fstab, ``(AddFstabToData( od, (list<map>)e)[1]:$[])); + y2milestone( "adapt_mp ti %1", ti ); + + integer idx = FstabAddDialog( ti ); + if( idx>=0 ) + { + od = (map<string,map>)Storage::GetOndiskTarget(); + y2milestone( "adapt_mp use fstab idx %1", idx ); + ti = AddFstabToData( od, (list<map>)fstab[idx]:[] ); + Storage::ResetOndiskTarget(); + foreach( string d, map disk, ti[0]:$[], + ``{ + foreach( map p, disk["partitions"]:[], + ``{ + if( size(p["mount"]:"")>0 && p["enc_type"]:`none!=`none && + !p["tmpcrypt"]:false ) + { + string pwd = DlgCreateCryptFs( p["device"]:"", 1, false, false ); + if( pwd != nil && size(pwd)>0 ) + Storage::SetCryptPwd( p["device"]:"", pwd ); + } + }); + }); + Storage::SetTargetMap(ti[0]:$[]); + } + } } Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Aug 7 11:18:52 2008 @@ -76,8 +76,6 @@ boolean button_expert = true; // Should the "EXPERT"-Button be shown in main window boolean button_delete_parttable = true; // Should the "Delete partition table and disk label" // -Button be shown in Expert menu - boolean button_adapt_mp = false; // Should the "Adapt mount points from - // existing /etc/fstab" -Button be shown in Expert menu boolean test_mode = Mode::test (); string boot_mode = "fritz"; @@ -117,17 +115,6 @@ bsd_label = true; } - if( Stage::initial () ) - { - button_adapt_mp = true; - } - if( Mode::repair () ) - { - button_adapt_mp = false; - } - - - y2debug( "ARCHIT %1", Arch::architecture () ); //////////////////////////////////////////////////////////////////////// @@ -2175,12 +2162,6 @@ add( expert_item_list , // menu entry text `item( `id (`reread), _("&Reread Partition Table"))); - if( button_adapt_mp ) - expert_item_list = - add( expert_item_list, - `item( `id (`adapt_mp), - // menu entry text - _("&Import Mount Points from Existing /etc/fstab"))); if ( button_delete_parttable ) expert_item_list = add( expert_item_list, @@ -2885,43 +2866,6 @@ } } - ///////////////////////////////////////////////////////////// - // Adapt mount points from existing /etc/fstab - ///////////////////////////////////////////////////////////// - - if (ret == `adapt_mp && Stage::initial() ) - { - map<string,map> od = (map<string,map>)Storage::GetOndiskTarget(); - list<list> fstab = scanAndReadExistingFstab( od ); - y2milestone( "adapt_mp fstab %1", fstab ); - list ti = maplist( list e, fstab, - ``(AddFstabToData( od, (list<map>)e)[1]:$[])); - y2milestone( "adapt_mp ti %1", ti ); - - integer idx = FstabAddDialog( ti ); - if( idx>=0 ) - { - od = (map<string,map>)Storage::GetOndiskTarget(); - y2milestone( "adapt_mp use fstab idx %1", idx ); - ti = AddFstabToData( od, (list<map>)fstab[idx]:[] ); - Storage::ResetOndiskTarget(); - foreach( string d, map disk, ti[0]:$[], - ``{ - foreach( map p, disk["partitions"]:[], - ``{ - if( size(p["mount"]:"")>0 && p["enc_type"]:`none!=`none && - !p["tmpcrypt"]:false ) - { - string pwd = DlgCreateCryptFs( p["device"]:"", 1, false, false ); - if( pwd != nil && size(pwd)>0 ) - Storage::SetCryptPwd( p["device"]:"", pwd ); - } - }); - }); - Storage::SetTargetMap( ti[0]:$[] ); - } - } - ///////////////////////////////////////////////////////////// // End of Actions, Now check the returncode ///////////////////////////////////////////////////////////// -- 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] r49805 - in /branches/tmp/lslezak/product-creator-cross-arch/src: dialogs.ycp helps.ycp
by lslezak＠svn.opensuse.org 07 Aug '08

07 Aug '08

Author: lslezak Date: Thu Aug 7 08:26:36 2008 New Revision: 49805 URL: http://svn.opensuse.org/viewcvs/yast?rev=49805&view=rev Log: - implemented manual change of the target architecture Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp branches/tmp/lslezak/product-creator-cross-arch/src/helps.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Thu Aug 7 08:26:36 2008 @@ -426,36 +426,61 @@ return (symbol)ret; } -string AskArch(list<string> archs) +string AskArch(string label, list<string> archs, string preselected) { - term widget = `VBox(); + term widget1 = `VBox(); + term widget2 = `VBox(); - boolean preselect = true; + const integer max_lines = 6; + + if (!contains(archs, preselected)) + { + y2warning("The preselected architecture is missing in the list!"); + // add the missing preselected arch + archs = prepend(archs, preselected); + } + + integer archsz = size(archs); + integer col1num = (archsz > max_lines) ? archsz / 2 : archsz; + y2milestone("Number of archs in the first column: %1", col1num); // preselect the first item foreach(string a, archs, { - widget = add(widget, `MinWidth(25, `Left(`RadioButton(`id(a), a, preselect)))); - preselect = false; + if (col1num > 0) + { + widget1 = add(widget1, `MinWidth(10, `Left(`RadioButton(`id(a), a, a == preselected)))); + } + else + { + widget2 = add(widget2, `MinWidth(10, `Left(`RadioButton(`id(a), a, a == preselected)))); + } + + col1num = col1num - 1; } ); term content = `MarginBox(1, 0.5, `VBox( - `Label(sformat(_("The source does not support the target architecture (%1). -Change the target architecture? -"), ProductCreator::GetArch)), + `Label(label), `VSpacing(1), `Frame(_("Target Architecture"), `RadioButtonGroup(`id(`rb), - widget + `HBox( + widget1, + `HStretch(), + widget2, + `HStretch() + ) ) ), `VSpacing(1), `HBox( - `PushButton(`id(`change), _("Change Architecture")), - `HSpacing(1), - `PushButton(`id(`cancel), Label::CancelButton()) + `HSpacing(`opt(`hstretch), 2), + `HWeight(1, `PushButton(`id(`change), Label::OKButton())), + `HSpacing(2), + `HWeight(1, `PushButton(`id(`cancel), Label::CancelButton())), + `HSpacing(`opt(`hstretch), 2) ) ) ); @@ -538,7 +563,11 @@ } // the architecture is different, ask to switch - string new_arch = AskArch(found_archs); + string new_arch = AskArch( + sformat(_("The source does not support the current target architecture (%1). +Change the target architecture? +"), ProductCreator::GetArch()), + found_archs, found_archs[0]:""); // nil == switch has been canceled if (new_arch != nil) @@ -583,11 +612,12 @@ `VBox( `HBox( `ReplacePoint(`id(`rp), - `Label(sformat(_("Target Architecture: %1"), ProductCreator::GetArch())) + `Label(sformat(_("Target architecture: %1"), ProductCreator::GetArch())) ), - `HSpacing(1), - `PushButton(`id(`arch), _("Change...")) + `HSpacing(2), + `PushButton(`id(`arch), Label::EditButton()) ), + `VSpacing(0.3), `HBox( `PushButton(`id(`select), Label::SelectButton() ), `PushButton(`id(`remove), Label::RemoveButton() ), @@ -743,7 +773,24 @@ } else if (ret == `arch) { - // TODO FIXME: ask for the target architecture + // ask for the target architecture + string new_arch = AskArch( + _("Select the new target architecture."), + // sort the lilst according to the current locale + lsort(["i386", "sparc", "sparc64", "mips", "mips64", "ppc", "ppc64", "alpha", + "s390_32", "s390_64", "ia64", "x86_64"]), + ProductCreator::GetArch()); + + // nil == switch has been canceled + if (new_arch != nil && new_arch != "" && new_arch != ProductCreator::GetArch()) + { + // change the architecture + ProductCreator::SetArch(new_arch); + + UI::ReplaceWidget(`rp, + `Label(sformat(_("Target Architecture: %1"), ProductCreator::GetArch())) + ); + } } else { y2error("unexpected retcode: %1", ret); Modified: branches/tmp/lslezak/product-creator-cross-arch/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/helps.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/helps.ycp Thu Aug 7 08:26:36 2008 @@ -91,10 +91,18 @@ "), - /* Configure2 dialog help 1/2 */ + /* Source selection help 1/2 */ "sourceDialog" : _("<big>Select Package Sources</big> Select at least one package source. -"), +") + /* Source selection help 2/2 */ + + _("<big>Target Architecture</big> +It is possible to create a product for different architecture than the architecture of this machine. +All selected repositories must support the target architecture. +Note: KIWI does not support different architectures yet, do not change the +architecture if you intend to create a KIWI image from the current configuration. +") + , /* Configure2 dialog help 1/2 */ "dest" : _("<big>ISO Directory and Image</big> -- 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] r49804 - /tags/stable-2_17_6/ncurses-pkg/
by kmachalkova＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: kmachalkova Date: Wed Aug 6 21:49:23 2008 New Revision: 49804 URL: http://svn.opensuse.org/viewcvs/yast?rev=49804&view=rev Log: Created tag stable-2_17_6 for ncurses-pkg Added: tags/stable-2_17_6/ncurses-pkg/ - copied from r49803, trunk/ncurses-pkg/ -- 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] r49803 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes
by kmachalkova＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: kmachalkova Date: Wed Aug 6 21:49:15 2008 New Revision: 49803 URL: http://svn.opensuse.org/viewcvs/yast?rev=49803&view=rev Log: Version 2.17.6 Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=49803&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Wed Aug 6 21:49:15 2008 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Wed Aug 6 21:49:15 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Aug 6 21:42:43 CEST 2008 - kmachalkova(a)suse.cz + +- Show "Start repository manager" menu only when requested by + `opt(`repoMgr) flag i.e. not in installation phase (bnc#381956) +- Added filtering packages by status (bnc#384085) +- Internal changes (YOU help, pkg selector modes) +- 2.17.6 + +------------------------------------------------------------------- Wed Jul 23 16:55:55 CEST 2008 - kmachalkova(a)suse.cz - Added pkg search modes (contains, regexp etc.) selection (uses -- 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] r49802 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: rhafer Date: Wed Aug 6 20:43:44 2008 New Revision: 49802 URL: http://svn.opensuse.org/viewcvs/yast?rev=49802&view=rev Log: Allow "hdb" databases to be edited Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Wed Aug 6 20:43:44 2008 @@ -1061,7 +1061,7 @@ ]; y2milestone( "adding database item '%1' as '%2'", label, item_name ); - if ( type == "bdb" ) + if ( type == "bdb" || type == "hdb" ) { widget_map[item_name] = bdb_item_map; widget_map[item_name + "_index"] = dbIndex; -- 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] r49801 - in /trunk/ldap-server/src: LdapDatabase.ycp LdapServer.pm
by rhafer＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: rhafer Date: Wed Aug 6 20:43:41 2008 New Revision: 49801 URL: http://svn.opensuse.org/viewcvs/yast?rev=49801&view=rev Log: Default to "hdb" for new databases Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp… ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Wed Aug 6 20:43:41 2008 @@ -24,7 +24,6 @@ list enc_types = [ `item( `id( "CRYPT"), "CRYPT", enctype == "CRYPT" ), `item( `id( "SMD5" ), "SMD5", enctype == "SMD5" ), - `item( `id( "SHA" ), "SHA", enctype == "SHA" ), `item( `id( "SSHA" ), "SSHA", enctype == "SSHA" ), `item( `id( "PLAIN" ), "PLAIN", enctype == "PLAIN" ) ]; @@ -174,7 +173,7 @@ map<string,string> db = $[ "suffix" : suffix, "directory" : directory, - "type" : "bdb", + "type" : "hdb", ]; if( rootdn != "" && (boolean)UI::QueryWidget( `cb_append_basedn, `Value ) ) { Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Aug 6 20:43:41 2008 @@ -942,7 +942,7 @@ $dbDefaults{'rootpw_clear'} = ""; $dbDefaults{'pwenctype'} = "SSHA"; $dbDefaults{'entrycache'} = 10000; - $dbDefaults{'idlcache'} = 10000; + $dbDefaults{'idlcache'} = 30000; $dbDefaults{'checkpoint'} = [ YaST::YCP::Integer(1024), YaST::YCP::Integer(5) ]; @@ -979,7 +979,7 @@ my $self = shift; my $pwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'rootpw_clear'} ); - my $database = { 'type' => 'bdb', + my $database = { 'type' => 'hdb', 'suffix' => $dbDefaults{'basedn'}, 'rootdn' => $dbDefaults{'rootdn'}, 'rootpw' => $pwHash, -- 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] r49800 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc lib/slapd-config.cpp lib/slapd-config.h
by rhafer＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: rhafer Date: Wed Aug 6 20:43:37 2008 New Revision: 49800 URL: http://svn.opensuse.org/viewcvs/yast?rev=49800&view=rev Log: Support "hdb" databases as well Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/slapd-config.cpp trunk/ldap-server/src/lib/slapd-config.h Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Wed Aug 6 20:43:37 2008 @@ -227,9 +227,9 @@ std::string dbtype(dbMap->value(YCPString("type"))->asString()->value_cstr()); y2milestone("Database Type: %s", dbtype.c_str()); boost::shared_ptr<OlcDatabase> db; - if ( dbtype == "bdb" ) + if ( dbtype == "bdb" || dbtype == "hdb" ) { - db = boost::shared_ptr<OlcDatabase>(new OlcBdbDatabase() ); + db = boost::shared_ptr<OlcDatabase>(new OlcBdbDatabase(dbtype) ); } else { @@ -266,7 +266,7 @@ } continue; } - if ( dbtype == "bdb" ) + if ( dbtype == "bdb" || dbtype == "hdb" ) { boost::shared_ptr<OlcBdbDatabase> bdb = boost::dynamic_pointer_cast<OlcBdbDatabase>(db); @@ -860,9 +860,9 @@ y2milestone("Database will get Index: %d", dbIndex); std::string dbtype(dbMap->value(YCPString("type"))->asString()->value_cstr()); boost::shared_ptr<OlcDatabase> db; - if ( dbtype == "bdb" ) + if ( dbtype == "bdb" || dbtype == "hdb" ) { - db = boost::shared_ptr<OlcDatabase>(new OlcBdbDatabase() ); + db = boost::shared_ptr<OlcDatabase>(new OlcBdbDatabase( dbtype ) ); } else { @@ -899,7 +899,7 @@ } continue; } - if ( dbtype == "bdb" ) + if ( dbtype == "bdb" || dbtype == "hdb" ) { boost::shared_ptr<OlcBdbDatabase> bdb = boost::dynamic_pointer_cast<OlcBdbDatabase>(db); Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Wed Aug 6 20:43:37 2008 @@ -88,9 +88,16 @@ m_dbEntryChanged.replaceAttribute(LDAPAttribute("olcDatabase", name.str())); } -OlcBdbDatabase::OlcBdbDatabase() : OlcDatabase("bdb") +OlcBdbDatabase::OlcBdbDatabase( const std::string& type ) : OlcDatabase(type) { - m_dbEntryChanged.addAttribute(LDAPAttribute("objectclass", "olcBdbConfig")); + if ( type == "hdb" ) + { + m_dbEntryChanged.addAttribute(LDAPAttribute("objectclass", "olcHdbConfig")); + } + else + { + m_dbEntryChanged.addAttribute(LDAPAttribute("objectclass", "olcBdbConfig")); + } } OlcBdbDatabase::OlcBdbDatabase( const LDAPEntry& le) : OlcDatabase(le) { } @@ -684,7 +691,7 @@ StringList oc = e.getAttributeByName("objectclass")->getValues(); for( StringList::const_iterator i = oc.begin(); i != oc.end(); i++ ) { - if ( strCaseIgnoreEquals(*i, "olcBdbConfig" ) ) + if ( strCaseIgnoreEquals(*i, "olcBdbConfig" ) || strCaseIgnoreEquals(*i, "olcHdbConfig" ) ) { return true; } Modified: trunk/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.h (original) +++ trunk/ldap-server/src/lib/slapd-config.h Wed Aug 6 20:43:37 2008 @@ -147,7 +147,7 @@ class OlcBdbDatabase : public OlcDatabase { public: - OlcBdbDatabase(); + OlcBdbDatabase( const std::string& type = "hdb"); OlcBdbDatabase( const LDAPEntry& le ); void setDirectory( const std::string &dir); -- 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] r49799 - in /trunk/ldap-server/src: dialogs.ycp wizards.ycp
by rhafer＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: rhafer Date: Wed Aug 6 20:43:33 2008 New Revision: 49799 URL: http://svn.opensuse.org/viewcvs/yast?rev=49799&view=rev Log: - Don't advance in Proposal workflow if service is disabled - Hide "Back"-Button on first page of wizard Modified: trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/wizards.ycp Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Wed Aug 6 20:43:33 2008 @@ -203,6 +203,7 @@ CWMFirewallInterfaces::CreateOpenFirewallWidget (firewall_settings); Wizard::SetContentsButtons( caption, dlg_service_initial, HELPS["service_dialog"]:"help not found", Label::BackButton(), Label::NextButton() ); + Wizard::HideBackButton(); UI::ReplaceWidget(`rp_firewall, firewall_widget["custom_widget"]:`Empty() @@ -212,10 +213,12 @@ if( (boolean)defaults["serviceEnabled"]:true ) { UI::ChangeWidget( `rb_yes, `Value, true ); + Wizard::SetNextButton( `next, Label::NextButton()); } else { UI::ChangeWidget( `cb_register_slp, `Enabled, false ); + Wizard::SetNextButton( `finish , Label::FinishButton()); } any ret = nil; @@ -246,10 +249,12 @@ { defaults["serviceEnabled"] = true; UI::ChangeWidget( `cb_register_slp, `Enabled, true ); + Wizard::SetNextButton( `next , Label::NextButton()); } else if( ret == `rb_no ) { defaults["serviceEnabled"] = false; UI::ChangeWidget( `cb_register_slp, `Enabled, false ); + Wizard::SetNextButton( `finish , Label::FinishButton()); } } Modified: trunk/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/wizards.ycp (original) +++ trunk/ldap-server/src/wizards.ycp Wed Aug 6 20:43:33 2008 @@ -72,21 +72,19 @@ map sequence = $[ "ws_start" : "startup", "startup" : $[ - `next : "tlssettings" + `next : "tlssettings", + `finish : `abort ], "tlssettings" : $[ `next : "database" ], "database" : $[ `next : "summary", - `back : `back, `abort : `abort, ], "summary" : $[ `next : "write", - `back : `back, - `abort : `back, - `cancel : `back, + `abort : `abort, `advanced : "advanced" ], "advanced" : $[ -- 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] r49798 - /trunk/ldap-server/src/complex.ycp
by rhafer＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: rhafer Date: Wed Aug 6 20:43:30 2008 New Revision: 49798 URL: http://svn.opensuse.org/viewcvs/yast?rev=49798&view=rev Log: disable advanced config button for now Modified: trunk/ldap-server/src/complex.ycp Modified: trunk/ldap-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Wed Aug 6 20:43:30 2008 @@ -480,10 +480,11 @@ /* Frame label */ term contents = `VBox( - `RichText( summary ), - `Right( - `PushButton( `id(`pb_advanced), _("Advanced Configuration") ) - ) + `RichText( summary ) + //, + //`Right( + // `PushButton( `id(`pb_advanced), _("Advanced Configuration") ) + //) ); Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", -- 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] r49797 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: rhafer Date: Wed Aug 6 20:43:27 2008 New Revision: 49797 URL: http://svn.opensuse.org/viewcvs/yast?rev=49797&view=rev Log: Set textdomain Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Aug 6 20:43:27 2008 @@ -12,6 +12,7 @@ package LdapServer; +textdomain("ldap-server"); use strict; use Data::Dumper; -- 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] r49796 - /trunk/ldap-server/src/YaPI/LdapServer.pm
by rhafer＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: rhafer Date: Wed Aug 6 18:25:55 2008 New Revision: 49796 URL: http://svn.opensuse.org/viewcvs/yast?rev=49796&view=rev Log: Init() function for YaPI, needs to be called before any other YaPI Call Modified: trunk/ldap-server/src/YaPI/LdapServer.pm Modified: trunk/ldap-server/src/YaPI/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/YaPI/LdapServer.… ============================================================================== --- trunk/ldap-server/src/YaPI/LdapServer.pm (original) +++ trunk/ldap-server/src/YaPI/LdapServer.pm Wed Aug 6 18:25:55 2008 @@ -10,6 +10,11 @@ use YaPI::LdapServer +$bool = Init() + + Initializes the API, needs to be called first, before any + other API call. + \@dbList = ReadDatabaseList() Returns a list of configured databases. @@ -146,6 +151,28 @@ our %TYPEINFO; =item * +C<\$bool = Init()> + +Initializes the API, needs to be called first, before any +other API call. + +=cut + +BEGIN { $TYPEINFO{Init} = ["function", "boolean"]; } +sub Init() +{ + my $self = shift; + my $rc = SCR->Execute('.ldapserver.init' ); + if ( ! $rc ) + { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "INIT_FAILED"; + return $self->SetError(%{$err}); + } + return 1; +} + +=item * C<\@dbList = ReadDatabaseList()> Returns a List of databases. Each element of the list is a hash reference -- 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] r49795 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc lib/slapd-config.cpp lib/slapd-config.h
by rhafer＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: rhafer Date: Wed Aug 6 18:25:51 2008 New Revision: 49795 URL: http://svn.opensuse.org/viewcvs/yast?rev=49795&view=rev Log: - Add some very basic ACLs to new databases - calculate {index} of database correctly Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/slapd-config.cpp trunk/ldap-server/src/lib/slapd-config.h Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Aug 6 18:25:51 2008 @@ -1223,20 +1223,31 @@ } my $rc; $db->{'rootpw'} = $self->HashPassword($db->{'pwenctype'}, $db->{'rootpw_clear'} ); - if ( $index > 0 ) + if ( $index == 0 ) { - $rc = SCR->Write(".ldapserver.database.new.{".$index."}", $db); - } - else - { - $rc = SCR->Write(".ldapserver.database.new.", $db); + # calculate new database index + $index = (scalar(@{$self->GetDatabaseList()} )) - 1; } + $rc = SCR->Write(".ldapserver.database.new.{$index}", $db); if(! $rc ) { my $err = SCR->Error(".ldapserver"); y2error("Adding Database failed: ".$err->{'summary'}." ".$err->{'description'}); $self->SetError( $err->{'summary'}, $err->{'description'} ); return 0; } + my @acls = ('to dn.subtree="'. $db->{'suffix'} .'" attrs=userPassword by self write by * auth', + # 'to attrs=shadowLastChange by self write by * read', + 'to dn.subtree="'. $db->{'suffix'} .'" by * read'); + foreach my $acl (@acls ) + { + $rc = SCR->Write(".ldapserver.database.{$index}.access", $acl ); + if(! $rc ) { + my $err = SCR->Error(".ldapserver"); + y2error("Adding default ACLs failed: ".$err->{'summary'}." ".$err->{'description'}); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return 0; + } + } return 1; } Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Wed Aug 6 18:25:51 2008 @@ -115,15 +115,26 @@ y2milestone("Path %s Length %ld ", path->toString().c_str(), path->length()); - if ( path->component_str(0) == "global" ) { + if ( path->component_str(0) == "global" ) + { y2milestone("Global Write"); return WriteGlobal(path->at(1), arg, arg2); - } else if ( (path->component_str(0) == "database") && (path->length() > 1) ) { + } + else if ( (path->component_str(0) == "database") && (path->length() > 1) ) + { y2milestone("Database Write"); return WriteDatabase(path->at(1), arg, arg2); - } else if ( path->component_str(0) == "schema" ) { + } + else if ( path->component_str(0) == "schema" ) + { y2milestone("Schema Write"); return WriteSchema(path->at(1), arg, arg2); + } + else if ( path->component_str(0) == "sambaACLHack" ) + { + // FIXME: remove this, when ACL support in WriteDatabase() is implemented + y2error("Warning: sambaACL is currently not implemented"); + return YCPBoolean(true); } else { lastError->add(YCPString("summary"), YCPString("Write Failed") ); std::string msg = "Unsupported SCR path: `.ldapserver."; @@ -167,7 +178,7 @@ olc = OlcConfig(lc); } } - if ( path->component_str(0) == "initFromLdif" ) + else if ( path->component_str(0) == "initFromLdif" ) { std::istringstream ldifstream(arg->asString()->value_cstr()); LdifReader ldif(ldifstream); @@ -811,7 +822,6 @@ dbIndexStr = ""; } } - YCPMap dbMap= arg->asMap(); int dbIndex = -2; if ( dbIndexStr[0] == '{' ) { @@ -834,12 +844,13 @@ bool ret = false; if ( databaseAdd ) { + YCPMap dbMap= arg->asMap(); y2milestone("creating new Database"); if ( dbIndex == -2 ) { dbIndex = databases.size()-1; //Database indexes start counting from -1 } - else if ( (dbIndex <=0) || (dbIndex > (int)databases.size()-2) ) + else if ( (dbIndex <=0) || (dbIndex > (int)databases.size()-1) ) { lastError->add(YCPString("summary"), YCPString("Adding Database Failed") ); std::string msg = "Invalid Index for new Database"; @@ -925,6 +936,7 @@ { if ( path->length() == 1 ) { + YCPMap dbMap= arg->asMap(); YCPValue val = dbMap.value( YCPString("rootdn") ); if ( ! val.isNull() && val->isString() ) { @@ -1031,6 +1043,12 @@ } ret = true; } + else if ( dbComponent == "access" ) + { + y2milestone("adding ACL rule: %s", arg->asString()->value_cstr() ); + (*i)->addAccessControl(arg->asString()->value_cstr()); + ret = true; + } else { lastError->add(YCPString("summary"), YCPString("Write Failed") ); Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Wed Aug 6 18:25:51 2008 @@ -653,6 +653,16 @@ return this->m_type; } +void OlcDatabase::addAccessControl(const std::string& acl, int index ) +{ + if ( index < 0 ) + { + StringList sl = this->getStringValues( "olcAccess" ); + index = sl.size(); + } + this->addIndexedStringValue( "olcAccess", acl, index ); +} + void OlcDatabase::addOverlay(boost::shared_ptr<OlcOverlay> overlay) { m_overlays.push_back(overlay); @@ -749,6 +759,14 @@ } } +void OlcConfigEntry::addIndexedStringValue(const std::string &type, + const std::string &value, int index) +{ + std::ostringstream oStr; + oStr << "{" << index << "}" << value; + this->addStringValue( type, oStr.str() ); +} + int OlcConfigEntry::getIntValue( const std::string &type ) const { StringList sl = this->getStringValues(type); Modified: trunk/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.h (original) +++ trunk/ldap-server/src/lib/slapd-config.h Wed Aug 6 18:25:51 2008 @@ -65,6 +65,9 @@ void setStringValue(const std::string &type, const std::string &value); void addStringValue(const std::string &type, const std::string &value); + void addIndexedStringValue( const std::string &type, + const std::string &value, int index ); + int getIntValue( const std::string &type ) const; void setIntValue( const std::string &type, int value ); @@ -72,7 +75,6 @@ int getEntryIndex() const; -// virtual std::map<std::string, std::list<std::string> > toMap() const; virtual std::string toLdif() const; protected: @@ -130,7 +132,7 @@ const std::string getSuffix() const; const std::string getType() const; - //virtual std::map<std::string, std::list<std::string> > toMap() const; + virtual void addAccessControl( const std::string& acl, int index=-1 ); void addOverlay(boost::shared_ptr<OlcOverlay> overlay); OlcOverlayList& getOverlays() ; @@ -140,7 +142,6 @@ virtual void updateEntryDn(); std::string m_type; OlcOverlayList m_overlays; - }; class OlcBdbDatabase : public OlcDatabase @@ -148,7 +149,6 @@ public: OlcBdbDatabase(); OlcBdbDatabase( const LDAPEntry& le ); - //virtual std::map<std::string, std::list<std::string> > toMap() const; void setDirectory( const std::string &dir); virtual IndexMap getDatabaseIndexes() const; @@ -185,7 +185,6 @@ OlcTlsSettings getTlsSettings() const; void setTlsSettings( const OlcTlsSettings& tls); - //virtual std::map<std::string, std::list<std::string> > toMap() const; }; class OlcSchemaConfig : public OlcConfigEntry -- 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] r49794 - in /trunk/ldap-server/src: LdapDatabase.ycp LdapServer.pm
by rhafer＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: rhafer Date: Wed Aug 6 18:25:46 2008 New Revision: 49794 URL: http://svn.opensuse.org/viewcvs/yast?rev=49794&view=rev Log: Set rootpw when adding new database Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp… ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Wed Aug 6 18:25:46 2008 @@ -183,8 +183,8 @@ if( rootdn != "" ) db = add( db, "rootdn", rootdn ); if( rootpw != "" ) { - db = add( db, "passwd", rootpw ); - db = add( db, "cryptmethod", cryptmethod ); + db = add( db, "rootpw_clear", rootpw ); + db = add( db, "pwenctype", cryptmethod ); } baseDb = db; break; Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Aug 6 18:25:46 2008 @@ -1222,6 +1222,7 @@ } } my $rc; + $db->{'rootpw'} = $self->HashPassword($db->{'pwenctype'}, $db->{'rootpw_clear'} ); if ( $index > 0 ) { $rc = SCR->Write(".ldapserver.database.new.{".$index."}", $db); -- 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] r49793 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc dialogs.ycp tree_structure.ycp wizards.ycp
by rhafer＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: rhafer Date: Wed Aug 6 18:22:47 2008 New Revision: 49793 URL: http://svn.opensuse.org/viewcvs/yast?rev=49793&view=rev Log: - Added TLS Settings Dialog to ProposalWizard() - fixed some initialization problems during ProposalSequence Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/wizards.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Aug 6 18:22:47 2008 @@ -43,6 +43,7 @@ my $useLdapiForConfig = 0; my %dbDefaults = (); +my $globals_initialized = 0; my $use_ldapi_listener = 0; my $use_ldaps_listener = 0; my $use_ldap_listener = 0; @@ -761,7 +762,7 @@ { my $self = shift; my $tls = shift; - if ( YaST::YCP::Boolean($tls->{'tls_active'}) ) + if ( $tls->{'tls_active'} ) { if ( SCR->Read(".target.size", $tls->{"caCertFile"}) <= 0) { @@ -950,6 +951,27 @@ return 1; } +BEGIN { $TYPEINFO {InitGlobals} = ["function", "boolean"]; } +sub InitGlobals +{ + my $self = shift; + if ( ! $globals_initialized ) + { + SCR->Execute('.ldapserver.initGlobals' ); + if(! $self->HaveCommonServerCertificate() ) + { + y2milestone( _("Common server certificate not available. StartTLS is disabled.") ); + } + else + { + $self->SetTlsConfigCommonCert(); + $self->SetProtocolListenerEnabled("ldaps", 1); + } + $globals_initialized = 1; + } + return 1; +} + BEGIN { $TYPEINFO {ReadFromDefaults} = ["function", "boolean"]; } sub ReadFromDefaults { @@ -976,7 +998,7 @@ ] }; - SCR->Execute('.ldapserver.initGlobals' ); + $self->InitGlobals(); SCR->Execute('.ldapserver.initSchema' ); my $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/core.ldif" ); if ( ! $rc ) { Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Wed Aug 6 18:22:47 2008 @@ -746,16 +746,22 @@ { if ( ! i.value().isNull() ) tls.setCaCertFile(i.value()->asString()->value_cstr() ); + else + tls.setCaCertFile(""); } else if ( key == "certFile" ) { if ( ! i.value().isNull() ) tls.setCertFile(i.value()->asString()->value_cstr() ); + else + tls.setCertFile(""); } else if ( key == "certKeyFile" ) { if ( ! i.value().isNull() ) tls.setCertKeyFile(i.value()->asString()->value_cstr() ); + else + tls.setCertKeyFile(""); } else if ( key == "crlCheck" ) { @@ -764,6 +770,9 @@ { if ( ! i.value().isNull() ) tls.setCrlFile (i.value()->asString()->value_cstr() ); + else + tls.setCertKeyFile(""); + } else if ( key == "verifyClient" ) { Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Wed Aug 6 18:22:47 2008 @@ -256,6 +256,41 @@ return ret; } +any TlsConfigDialog() +{ + Wizard::SetContentsButtons( caption, tlsWidget, HELPS["tls_dialog"]:"help not found", Label::BackButton(), Label::NextButton() ); + LdapServer::InitGlobals(); + cb_read_tls(); + any ret = nil; + while( true ) + { + ret = UI::UserInput(); + y2milestone( "TlsConfigDialog: seeing return value '%1'", ret ); + + if( ret == `back || ret == `abort || ret == `cancel) + { + break; + } + else if( ret == `next || ret == `finish ) + { + if (! cb_write_tls() ) + { + Report::Error( callback_error ); + continue; + } + break; + } + else if( is( ret, symbol ) ) + { + handler_cmd = (symbol)ret; + cb_input_tls(); + } + } + + return ret; + +} + any ProposalDialog() { map <string, any> defaults = LdapServer::GetInitialDefaults(); Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Wed Aug 6 18:22:47 2008 @@ -365,8 +365,24 @@ "caCertDir" : "", "crlFile" : "", "crlCheck" : 0, - "verifyClient" : 0 + "verifyClient" : 0, + "tls_active" : true ]; + if ( (string)tlsSettings["caCertFile"]:"" == "" ) + { + callback_error = _("Please select a valid CA Certificate File"); + return false; + } + if ( (string)tlsSettings["certFile"]:"" == "" ) + { + callback_error = _("Please select a valid Certificate File"); + return false; + } + if ( (string)tlsSettings["certKeyFile"]:"" == "" ) + { + callback_error = _("Please select a valid Certificate Key File"); + return false; + } if ( ! LdapServer::SetTlsConfig( tlsSettings ) ) { map<string, string> err = LdapServer::GetError(); @@ -466,6 +482,7 @@ else if( handler_cmd == `pb_launch_ca ) { WFM::CallFunction("ca_mgm", [] ); + cb_read_tls(); } //reread tls page return true; Modified: trunk/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/wizards.ycp (original) +++ trunk/ldap-server/src/wizards.ycp Wed Aug 6 18:22:47 2008 @@ -62,6 +62,7 @@ map aliases = $[ "startup" : ``( EnableServiceDialog() ), + "tlssettings" : ``( TlsConfigDialog() ), "database" : ``( ProposalDialog() ), "summary" : ``(SummaryDialog() ), "advanced" : ``(MainSequence() ), @@ -71,6 +72,9 @@ map sequence = $[ "ws_start" : "startup", "startup" : $[ + `next : "tlssettings" + ], + "tlssettings" : $[ `next : "database" ], "database" : $[ -- 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] r49792 - in /trunk/storage/storage/src: include/ep-main.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: aschnell Date: Wed Aug 6 18:14:54 2008 New Revision: 49792 URL: http://svn.opensuse.org/viewcvs/yast?rev=49792&view=rev Log: - fixed return value Modified: trunk/storage/storage/src/include/ep-main.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Wed Aug 6 18:14:54 2008 @@ -215,7 +215,7 @@ } - any test_new_ep() + any ExpertPartitioner() { SCR::Write(.target.ycp, Storage::SaveDumpPath("targetmap-ep-start"), Storage::GetTargetMap()); @@ -306,6 +306,6 @@ Storage::DisposeTargetBackup("expert-partitioner"); } - return `abort; + return widget; } } Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Wed Aug 6 18:14:54 2008 @@ -2118,7 +2118,7 @@ // MAIN: ///////////////////////////////////////////////////////////////// - return test_new_ep(); + return ExpertPartitioner(); -- 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] r49791 - in /trunk/auditd/src: Auditd.ycp complex.ycp wizards.ycp
by gs＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: gs Date: Wed Aug 6 18:14:27 2008 New Revision: 49791 URL: http://svn.opensuse.org/viewcvs/yast?rev=49791&view=rev Log: add a workflow step "check" to be able to check rules Modified: trunk/auditd/src/Auditd.ycp trunk/auditd/src/complex.ycp trunk/auditd/src/wizards.ycp Modified: trunk/auditd/src/Auditd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/Auditd.ycp?rev=49791&… ============================================================================== --- trunk/auditd/src/Auditd.ycp (original) +++ trunk/auditd/src/Auditd.ycp Wed Aug 6 18:14:27 2008 @@ -74,6 +74,16 @@ */ boolean write_only = false; +boolean rules_locked = false; + +global void SetRulesLocked( boolean value ) { + rules_locked = value; +} + +global boolean RulesLocked() { + return rules_locked; +} + /** * Return rules file path */ Modified: trunk/auditd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/complex.ycp?rev=49791… ============================================================================== --- trunk/auditd/src/complex.ycp (original) +++ trunk/auditd/src/complex.ycp Wed Aug 6 18:14:27 2008 @@ -286,12 +286,36 @@ void StoreRulesDialog( string id, map event) { string rules = (string)UI::QueryWidget( `id("rules"), `Value ); - + Auditd::SetRules( rules ); y2debug( "RULES: %1", rules ); y2milestone( "Store rules dialog" ); } +symbol CheckSettings() { + symbol ret = `next; + + Auditd::SetRulesLocked( false ); + + string rules = (string)UI::QueryWidget( `id("rules"), `Value ); + list <string> rules_list = splitstring( rules, "\n"); + + foreach ( string rule, rules_list, { + if ( regexpmatch( rule, "^[ /t]*-e[ /t]*2" ) ) + { + boolean yes = Popup::YesNo( _("Lock is set in audit.rules (-e 2).\n +Are you sure that you want to lock the rules until next boot?\n +If you want to change the rules, press 'No' to go back to rules editor.") ); + if ( yes ) + ret = `next; + else + ret = `back; + Auditd::SetRulesLocked( true ); + } + } ); + return ret; +} + /* EOF */ } Modified: trunk/auditd/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/wizards.ycp?rev=49791… ============================================================================== --- trunk/auditd/src/wizards.ycp (original) +++ trunk/auditd/src/wizards.ycp Wed Aug 6 18:14:27 2008 @@ -102,12 +102,19 @@ ], ]; + string ini_tab = ""; + + if ( Auditd::RulesLocked() ) + ini_tab = "auditd_rules"; + else + ini_tab = "logfile_settings"; + map <string, any> wd = $[ "tab" : CWMTab::CreateWidget ($[ "tab_order" : ["logfile_settings", "dispatcher", "diskspace_settings", "auditd_rules"], "tabs" : tabs, "widget_descr" : widgets, - "initial_tab" : "logfile_settings", + "initial_tab" : ini_tab, ]) ]; @@ -140,6 +147,7 @@ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainSequence() ), + "check" : ``( CheckSettings() ), "write" : [ ``( WriteDialog() ), true ] ]; @@ -151,7 +159,11 @@ ], "main" : $[ `abort : `abort, - `next : "write" + `next : "check" + ], + "check" : $[ + `abort: `abort, + `next: "write" ], "write" : $[ `abort : `abort, -- 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] r49790 - in /trunk/auditd/src: complex.ycp dialogs.ycp
by gs＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: gs Date: Wed Aug 6 17:32:43 2008 New Revision: 49790 URL: http://svn.opensuse.org/viewcvs/yast?rev=49790&view=rev Log: add a test, restore and reset button to rules dialog Modified: trunk/auditd/src/complex.ycp trunk/auditd/src/dialogs.ycp Modified: trunk/auditd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/complex.ycp?rev=49790… ============================================================================== --- trunk/auditd/src/complex.ycp (original) +++ trunk/auditd/src/complex.ycp Wed Aug 6 17:32:43 2008 @@ -244,6 +244,42 @@ UI::ChangeWidget(`id("rules"), `Value, mergestring( new_rules, "\n" ) ); } } + else if ( action == "restore" ) + { + UI::ChangeWidget( `id("rules"), `Value, Auditd::GetRules() ); + } + else if ( action == "reset" ) + { + UI::ChangeWidget( `id("rules"), `Value, Auditd::GetRules() ); + integer exit_code = (integer)SCR::Execute( .target.bash, "auditctl -D" ); + if ( exit_code == 0 ) + exit_code = (integer)SCR::Execute( .target.bash, "auditctl -R /etc/audit/audit.rules" ); + if ( exit_code == 0 ) + Popup::Message( _("Rules successfully restored" ) ); + else + Report::Error( _("Cannot reset rules, please test again" ) ); + } + else if ( action == "test" ) + { + boolean success = (boolean)SCR::Write(.target.string, "/tmp/tmp_rules_file", + (string)UI::QueryWidget( `id("rules"), `Value ) ); + if ( success ) + { + map output = (map)SCR::Execute(.target.bash_output, "auditctl -R /tmp/tmp_rules_file" ); + if ( output["exit"]:0 != 0 ) + { + Report::Error( sformat( output["stderr"]:"" ) ); + } + else + { + Popup::Message( "Success"); + } + } + else + { + Report::Error( _("Cannnot create tmp file for rules" ) ); + } + } return nil; } Modified: trunk/auditd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/dialogs.ycp?rev=49790… ============================================================================== --- trunk/auditd/src/dialogs.ycp (original) +++ trunk/auditd/src/dialogs.ycp Wed Aug 6 17:32:43 2008 @@ -193,11 +193,19 @@ )), `VStretch() ) - ) ) , - `VWeight( 80, `VBox( - `Left(`Label(_("Edit rules for audit daemon here:") ) ), + ) ), + `VWeight( 70, `VBox( + `Left(`Label(_("Edit rules for audit subsystem here:") ) ), `MultiLineEdit(`id("rules"), Auditd::GetRulesFile() ) - ) + + ) ), + `VWeight( 10, + `HBox(`PushButton( `id( "test" ), _("Test") ), + `HSpacing(2.0), + `PushButton( `id( "restore" ), _("Restore 'audit.rules'") ), + `HSpacing(2.0), + `PushButton( `id( "reset" ), _("Restore and Reset") ) + ) ), `VStretch() ) -- 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] r49789 - /trunk/storage/package/yast2-storage.changes
by aschnell＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: aschnell Date: Wed Aug 6 17:11:51 2008 New Revision: 49789 URL: http://svn.opensuse.org/viewcvs/yast?rev=49789&view=rev Log: - better text Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Aug 6 17:11:51 2008 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Aug 06 17:02:27 CEST 2008 - aschnell(a)suse.de -- do not show /var/log/messages during installation +- do not try to show /var/log/messages during installation - version 2.17.12 ------------------------------------------------------------------- -- 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] r49788 - in /trunk/storage: VERSION package/yast2-storage.changes storage/src/include/ep-main.ycp
by aschnell＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: aschnell Date: Wed Aug 6 17:09:16 2008 New Revision: 49788 URL: http://svn.opensuse.org/viewcvs/yast?rev=49788&view=rev Log: - do not show /var/log/messages during installation Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49788&r1=497… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Wed Aug 6 17:09:16 2008 @@ -1 +1 @@ -2.17.11 +2.17.12 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Aug 6 17:09:16 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 06 17:02:27 CEST 2008 - aschnell(a)suse.de + +- do not show /var/log/messages during installation +- version 2.17.12 + +------------------------------------------------------------------- Tue Aug 05 12:07:10 CEST 2008 - aschnell(a)suse.de - removed EVMS functions from StorageInterface.h Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Wed Aug 6 17:09:16 2008 @@ -169,8 +169,10 @@ `item(`id(`nfs), `icon(nfs_icon), _("NFS"), open(`nfs), subtree[`nfs]:[]), `item(`id(`unused), `icon(unused_icon), _("Unused Devices"), open(`unused)) ]), - `item(`id(`settings), `icon(settings_icon), _("Settings"), open(`settings)), - `item(`id(`log), `icon(log_icon), _("Log"), open(`log)) ]; + `item(`id(`settings), `icon(settings_icon), _("Settings"), open(`settings)) ]; + + if (Mode::normal()) + tree = add(tree, `item(`id(`log), `icon(log_icon), _("Log"), open(`log))); } -- 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] r49787 - /tags/stable-2_17_1/theme/
by aschnell＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: aschnell Date: Wed Aug 6 17:03:13 2008 New Revision: 49787 URL: http://svn.opensuse.org/viewcvs/yast?rev=49787&view=rev Log: Created tag stable-2_17_1 for theme Added: tags/stable-2_17_1/theme/ - copied from r49786, trunk/theme/ -- 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] r49786 - /trunk/theme/package/yast2-theme.changes
by aschnell＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: aschnell Date: Wed Aug 6 16:57:08 2008 New Revision: 49786 URL: http://svn.opensuse.org/viewcvs/yast?rev=49786&view=rev Log: - new version for autobuild Modified: trunk/theme/package/yast2-theme.changes Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Wed Aug 6 16:57:08 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 06 16:56:21 CEST 2008 - aschnell(a)suse.de + +- icons for new expert partitioner +- 2.17.1 + +------------------------------------------------------------------- Fri Jul 11 13:13:36 CEST 2008 - locilka(a)suse.cz - Added msg_question.png to all 32x32. -- 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] r49785 - /branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp
by lslezak＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: lslezak Date: Wed Aug 6 16:41:24 2008 New Revision: 49785 URL: http://svn.opensuse.org/viewcvs/yast?rev=49785&view=rev Log: - display the target architecture in the source selection dialog Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Wed Aug 6 16:41:24 2008 @@ -442,9 +442,9 @@ term content = `MarginBox(1, 0.5, `VBox( - `Label(sformat(_("The source does not support the architecture of this machine (%1). + `Label(sformat(_("The source does not support the target architecture (%1). Change the target architecture? -"), Arch::architecture())), +"), ProductCreator::GetArch)), `VSpacing(1), `Frame(_("Target Architecture"), `RadioButtonGroup(`id(`rb), @@ -580,12 +580,21 @@ term buttons = - `HBox( - `PushButton(`id(`select), Label::SelectButton() ), - `PushButton(`id(`remove), Label::RemoveButton() ), - // push button label - `PushButton(`id(`create), _("Cr&eate New...")) - ); + `VBox( + `HBox( + `ReplacePoint(`id(`rp), + `Label(sformat(_("Target Architecture: %1"), ProductCreator::GetArch())) + ), + `HSpacing(1), + `PushButton(`id(`arch), _("Change...")) + ), + `HBox( + `PushButton(`id(`select), Label::SelectButton() ), + `PushButton(`id(`remove), Label::RemoveButton() ), + // push button label + `PushButton(`id(`create), _("Cr&eate New...")) + ) + ); term contents = @@ -629,6 +638,7 @@ else if (ret == `select) { integer SrcID = (integer)UI::QueryWidget(`id(`table), `CurrentItem); + string target_arch = ProductCreator::GetArch(); boolean repo_ok = CheckArchitecture(SrcID); @@ -648,6 +658,14 @@ } UI::ChangeWidget(`id(`table), `Item(SrcID, 0) , _("X")); + + // refresh the target architecture if it has been changed + if (target_arch != ProductCreator::GetArch()) + { + UI::ReplaceWidget(`rp, + `Label(sformat(_("Target Architecture: %1"), ProductCreator::GetArch())) + ); + } } } else if (ret == `remove) @@ -713,7 +731,6 @@ // TODO: check archs onece again (needed after switching architecture multiple times) // reload repositories Pkg::SourceFinishAll(); -// Pkg::TargetInit("/"); Pkg::SourceStartManager(false); } @@ -724,6 +741,10 @@ else if( ret == `back) { break; } + else if (ret == `arch) + { + // TODO FIXME: ask for the target architecture + } else { y2error("unexpected retcode: %1", ret); continue; -- 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] r49784 - in /trunk/auditd/src: Auditd.ycp complex.ycp
by gs＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: gs Date: Wed Aug 6 16:26:50 2008 New Revision: 49784 URL: http://svn.opensuse.org/viewcvs/yast?rev=49784&view=rev Log: add error message Modified: trunk/auditd/src/Auditd.ycp trunk/auditd/src/complex.ycp Modified: trunk/auditd/src/Auditd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/Auditd.ycp?rev=49784&… ============================================================================== --- trunk/auditd/src/Auditd.ycp (original) +++ trunk/auditd/src/Auditd.ycp Wed Aug 6 16:26:50 2008 @@ -441,8 +441,15 @@ sleep(sl); // call auditctl -R audit.rules - success = (boolean)SCR::Execute( .target.bash, "auditctl -R /etc/audit/audit.rules" ); - + map output = (map)SCR::Execute( .target.bash_output, "auditctl -R /etc/audit/audit.rules" ); + + if ( output["exit"]:0 != 0 ) + { + Report::Error( sformat( "%1\n%2", + output["stderr"]:"", + _("Please start yast2-auditd again and check the rules") ) ); + } + if(PollAbort()) return false; return true; } Modified: trunk/auditd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/complex.ycp?rev=49784… ============================================================================== --- trunk/auditd/src/complex.ycp (original) +++ trunk/auditd/src/complex.ycp Wed Aug 6 16:26:50 2008 @@ -90,9 +90,8 @@ "log_format", "max_log_file", "flush", - "max_log_file_action", - "name_format", - "name"], { + "max_log_file_action" // TODO: add 'name_format' and 'name' + ], { UI::ChangeWidget(`id(key), `Value, (Auditd::GetAuditdOption(key))); }); @@ -130,9 +129,8 @@ "log_format", "max_log_file", "flush", - "max_log_file_action", - "name_format", - "name"], { + "max_log_file_action" // TODO: add 'name_format' and 'name' + ], { Auditd::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) ); }); y2milestone( "Store logfile settings" ); -- 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] r49783 - /tags/stable-2_17_5/dns-server/
by locilka＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: locilka Date: Wed Aug 6 16:16:07 2008 New Revision: 49783 URL: http://svn.opensuse.org/viewcvs/yast?rev=49783&view=rev Log: Created tag stable-2_17_5 for dns-server Added: tags/stable-2_17_5/dns-server/ - copied from r49782, trunk/dns-server/ -- 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] r49782 - /trunk/dns-server/yast2-dns-server.spec.in
by locilka＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: locilka Date: Wed Aug 6 16:15:55 2008 New Revision: 49782 URL: http://svn.opensuse.org/viewcvs/yast?rev=49782&view=rev Log: Less warnings from abuild Modified: trunk/dns-server/yast2-dns-server.spec.in Modified: trunk/dns-server/yast2-dns-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/yast2-dns-server.spec… ============================================================================== --- trunk/dns-server/yast2-dns-server.spec.in (original) +++ trunk/dns-server/yast2-dns-server.spec.in Wed Aug 6 16:15:55 2008 @@ -26,7 +26,7 @@ Summary: Configuration of dns-server %description -- +This package contains the YaST2 component for DNS server configuration. @PREP@ -- 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] r49781 - /trunk/dns-server/src/DnsZones.pm
by locilka＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: locilka Date: Wed Aug 6 16:14:27 2008 New Revision: 49781 URL: http://svn.opensuse.org/viewcvs/yast?rev=49781&view=rev Log: To keep testsuite compatible Modified: trunk/dns-server/src/DnsZones.pm Modified: trunk/dns-server/src/DnsZones.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsZones.pm?rev=4… ============================================================================== --- trunk/dns-server/src/DnsZones.pm (original) +++ trunk/dns-server/src/DnsZones.pm Wed Aug 6 16:14:27 2008 @@ -24,6 +24,7 @@ YaST::YCP::Import ("Hostname"); YaST::YCP::Import ("String"); +YaST::YCP::Import ("Mode"); #use io_routines; #use check_routines; @@ -58,6 +59,11 @@ my $self = shift; my $out = SCR->Execute (".target.bash_output", "/bin/hostname --fqdn"); + + if (Mode->test()) { + return ""; + } + # standard return if ($out->{"exit"} eq "0") { my $stdout = $out->{"stdout"}; -- 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] r49780 - /tags/stable-2_17_11/bootloader/
by juhliarik＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: juhliarik Date: Wed Aug 6 16:14:02 2008 New Revision: 49780 URL: http://svn.opensuse.org/viewcvs/yast?rev=49780&view=rev Log: Created tag stable-2_17_11 for bootloader Added: tags/stable-2_17_11/bootloader/ - copied from r49779, trunk/bootloader/ -- 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] r49779 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: juhliarik Date: Wed Aug 6 16:13:53 2008 New Revision: 49779 URL: http://svn.opensuse.org/viewcvs/yast?rev=49779&view=rev Log: new version 2.17.11 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=49779&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Wed Aug 6 16:13:53 2008 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Wed Aug 6 16:13:53 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Aug 6 15:42:28 CEST 2008 - juhliarik(a)suse.cz + +- added better detection of NFS boot device (bnc #408912) +- added better detection of EVMS - do not install bootloader + (fate #305007) +- 2.17.11 + +------------------------------------------------------------------- Wed Aug 6 12:55:17 CEST 2008 - juhliarik(a)suse.cz - added support for acoustic signals (fate #303481) -- 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] r49778 - /trunk/bootloader/src/clients/bootloader_proposal.ycp
by juhliarik＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: juhliarik Date: Wed Aug 6 16:05:58 2008 New Revision: 49778 URL: http://svn.opensuse.org/viewcvs/yast?rev=49778&view=rev Log: deleted undeclared variable Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_proposal.ycp (original) +++ trunk/bootloader/src/clients/bootloader_proposal.ycp Wed Aug 6 16:05:58 2008 @@ -129,7 +129,7 @@ { y2milestone("bootlader_proposal::MakeProposal -> Boot partition is nfs type, bootloader will not be installed."); - y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:""); + y2milestone("Type of BootPartitionDevice: %1", device); return ret; } -- 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] r49777 - in /trunk/dns-server: VERSION package/yast2-dns-server.changes src/DnsZones.pm
by locilka＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: locilka Date: Wed Aug 6 16:05:27 2008 New Revision: 49777 URL: http://svn.opensuse.org/viewcvs/yast?rev=49777&view=rev Log: - DNS zones need a FQDN hostname, using /etc/HOSTNAME as a fallback when hostname --fqdn returns empty string (bnc #403468). - 2.17.5 Modified: trunk/dns-server/VERSION trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsZones.pm Modified: trunk/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/VERSION?rev=49777&r1=… ============================================================================== --- trunk/dns-server/VERSION (original) +++ trunk/dns-server/VERSION Wed Aug 6 16:05:27 2008 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Wed Aug 6 16:05:27 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Aug 6 15:54:32 CEST 2008 - locilka(a)suse.cz + +- DNS zones need a FQDN hostname, using /etc/HOSTNAME as a fallback + when hostname --fqdn returns empty string (bnc #403468). +- 2.17.5 + +------------------------------------------------------------------- Tue Aug 5 10:53:13 CEST 2008 - locilka(a)suse.cz - Adjusted to the newest LDAP SCR agent (patch written by jsuchome) Modified: trunk/dns-server/src/DnsZones.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsZones.pm?rev=4… ============================================================================== --- trunk/dns-server/src/DnsZones.pm (original) +++ trunk/dns-server/src/DnsZones.pm Wed Aug 6 16:05:27 2008 @@ -58,13 +58,20 @@ my $self = shift; my $out = SCR->Execute (".target.bash_output", "/bin/hostname --fqdn"); - if ($out->{"exit"} ne 0) - { - return "@"; + # standard return + if ($out->{"exit"} eq "0") { + my $stdout = $out->{"stdout"}; + my ($ret, $rest) = split ("\n", $stdout, 2); + + return $ret; + # fallback + } else { + my $hostname = SCR->Read (".target.string", "/etc/HOSTNAME"); + my ($ret, $rest) = split ("\n", $hostname, 2); + y2warning ("Using fallback hostname: ".$ret); + + return $ret; } - my $stdout = $out->{"stdout"}; - my ($ret, $rest) = split ("\n", $stdout, 2); - return $ret; } BEGIN { $TYPEINFO{AbsoluteZoneFileName} = ["function", "string", "string" ]; } @@ -129,7 +136,11 @@ sub GetDefaultSOA { my $self = shift; - my $fqdn = $self->GetFQDN (); + my $fqdn = $self->GetFQDN(); + if ($fqdn eq "") { + $fqdn = "linux.site"; + } + $fqdn = "$fqdn."; my $adm_mail = "root.$fqdn"; my %soa = ( -- 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] r49776 - in /trunk/yast2/library/log/src: ALog.ycp Makefile.am
by mvidner＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: mvidner Date: Wed Aug 6 15:50:01 2008 New Revision: 49776 URL: http://svn.opensuse.org/viewcvs/yast?rev=49776&view=rev Log: Added a prototype of FATE#303700: Admin's Log, producing a summary of what YaST did to the system Added: trunk/yast2/library/log/src/ALog.ycp (with props) Modified: trunk/yast2/library/log/src/Makefile.am Added: trunk/yast2/library/log/src/ALog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/log/src/ALog.ycp?r… ============================================================================== --- trunk/yast2/library/log/src/ALog.ycp (added) +++ trunk/yast2/library/log/src/ALog.ycp Wed Aug 6 15:50:01 2008 @@ -0,0 +1,83 @@ +/** + * File: modules/ALog.ycp + * Package: YaST2 + * Summary: Admin's Log, producing a summary of what YaST did to the system + * Authors: Martin Vidner <mvidner(a)suse.cz> + * + * $Id$ + * FATE#303700 + * TODO stability tag. + * + * <pre> + * ALog::Item("/etc/ntp.conf: added 'server ntp.example.org'"); + * ALog::Item("enabled /etd/init.d/ntp"); + * ALog::Item("started /etd/init.d/ntp"); + * + * ALog::CommitPopup(); + * ALog::Note("set up ntp from local server"); + * </pre> + */ + +{ +module "ALog"; +textdomain "base"; + +import "Label"; + +void doLog(string type, string msg) { + // TODO make a separate log, this is just a prototype + y2internal("{%1} %2", type, msg); +} + +/** + * Log a change to the system from the system point of view. + * msg should include the file being changed, and what changes are made + * (TODO: with all detail? or summary?) + * Example "/etc/ntp.conf: added 'server ntp.example.org'" + * @param msg message + */ +global void Item(string msg) { + doLog ("item", msg); +} + +/** + * Log a change to the system from the human point of view. + * (It will appear slightly differently in the log) + * Example "get proper time from the corporate time server + * as requested in ticket bofh#327" + * @param msg message + */ +global void Note(string msg) { + doLog ("note", msg); +} + +string uiInput(string label) { + // TODO more lines? + term d = `VBox( + `InputField (`id (`val), label, ""), + `PushButton (`id (`ok), `opt (`default, `key_F10), Label::OKButton ()) + ); + UI::OpenDialog (d); + any ui = nil; + do { + ui = UI::UserInput (); + } while (ui != `ok || ui != `cancel); + + string val = nil; + if (ui == `ok) { + val = (string) UI::QueryWidget (`id (`val), `Value); + } + return val; +} + +/** + * Prompt the user for a message to describe the changes + * that she did using YaST, logs it using @ref Note + */ +global void CommitPopup() { + string i = uiInput(_("Enter a log message to describe the changes that you did")); + string msg = (i == nil)? "*empty log message*": i; + Note(msg); +} + +} Modified: trunk/yast2/library/log/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/log/src/Makefile.a… ============================================================================== --- trunk/yast2/library/log/src/Makefile.am (original) +++ trunk/yast2/library/log/src/Makefile.am Wed Aug 6 15:50:01 2008 @@ -1,6 +1,7 @@ # Makefile.am for yast2/library/log/src module_DATA = \ + ALog.ycp \ LogView.ycp \ LogViewCore.ycp -- 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] r49775 - in /trunk/bootloader/src: clients/bootloader_proposal.ycp config/bootloader.rnc modules/Bootloader.ycp routines/dialogs.ycp routines/misc.ycp
by juhliarik＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: juhliarik Date: Wed Aug 6 15:42:22 2008 New Revision: 49775 URL: http://svn.opensuse.org/viewcvs/yast?rev=49775&view=rev Log: - added better detection of NFS boot device - added better detection of EVMS - do not install bootlaoder (fate #305007) M bootloader/src/clients/bootloader_proposal.ycp M bootloader/src/config/bootloader.rnc M bootloader/src/modules/Bootloader.ycp M bootloader/src/routines/dialogs.ycp * added better detection of NFS boot device M bootloader/src/routines/misc.ycp * added better detection of EVMS Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp trunk/bootloader/src/config/bootloader.rnc trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/dialogs.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_proposal.ycp (original) +++ trunk/bootloader/src/clients/bootloader_proposal.ycp Wed Aug 6 15:42:22 2008 @@ -124,22 +124,16 @@ //F#300779 - Install diskless client (NFS-root) //kokso: bootloader will not be installed - - map dev = $[]; - if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil)) - dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - else - dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - - if (dev["disk"]:"" == "/dev/nfs") + string device = BootCommon::getBootDisk(); + if (device == "/dev/nfs") { - + y2milestone("bootlader_proposal::MakeProposal -> Boot partition is nfs type, bootloader will not be installed."); y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:""); return ret; } - y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:""); + y2milestone("Type of BootPartitionDevice: %1", device); //F#300779 - end Modified: trunk/bootloader/src/config/bootloader.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/config/bootloader… ============================================================================== --- trunk/bootloader/src/config/bootloader.rnc (original) +++ trunk/bootloader/src/config/bootloader.rnc Wed Aug 6 15:42:22 2008 @@ -90,6 +90,9 @@ element xen {text}? & element xen_append {text}? & element noverifyroot { "true" | "false" }? & + element makeactive { "true" | "false" }? & + element remap { "true" | "false" }? & + element configfile {text}? & element image {text}? } kernel_parameters = element kernel_parameters { text } Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Wed Aug 6 15:42:22 2008 @@ -293,12 +293,8 @@ // F#300779 - Install diskless client (NFS-root) // kokso: additional warning that root partition is nfs type -> bootloader will not be installed - map dev = $[]; - if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil)) - dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - else - dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - if (dev["disk"]:"" == "/dev/nfs") + string device = BootCommon::getBootDisk(); + if (device == "/dev/nfs") { ret = add (ret, _("The boot partition is of type NFS. Bootloader cannot be installed.")); @@ -537,13 +533,9 @@ //F#300779 - Install diskless client (NFS-root) //kokso: bootloader will not be installed + string device = BootCommon::getBootDisk(); - map dev = $[]; - if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil)) - dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - else - dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - if (dev["disk"]:"" == "/dev/nfs") + if (device == "/dev/nfs") { y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed."); return ret; @@ -679,13 +671,9 @@ // F#300779 - Install diskless client (NFS-root) // kokso: bootloader will not be installed + string device = BootCommon::getBootDisk(); - map dev = $[]; - if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil)) - dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - else - dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - if (dev["disk"]:"" == "/dev/nfs") + if (device == "/dev/nfs") { y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed."); return ret; Modified: trunk/bootloader/src/routines/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/dialogs.… ============================================================================== --- trunk/bootloader/src/routines/dialogs.ycp (original) +++ trunk/bootloader/src/routines/dialogs.ycp Wed Aug 6 15:42:22 2008 @@ -27,8 +27,6 @@ import "Wizard"; import "Bootloader"; import "Stage"; -//F#300779 - Install diskless client (NFS-root) -import "Storage"; include "bootloader/routines/popups.ycp"; include "bootloader/routines/section_widgets.ycp"; @@ -91,13 +89,9 @@ //F#300779 - Install diskless client (NFS-root) //kokso: additional warning that root partition is nfs type -> bootloader will not be installed + string device = BootCommon::getBootDisk(); - map dev = $[]; - if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil)) - dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - else - dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - if ((dev["disk"]:"" == "/dev/nfs") && (Mode::installation())) + if ((device == "/dev/nfs") && (Mode::installation())) { Popup::Message(_("The boot partition is of type NFS. Bootloader cannot be installed.")); y2milestone("dialogs::MainDialog() -> Boot partition is nfs type, bootloader will not be installed."); Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp… ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Wed Aug 6 15:42:22 2008 @@ -41,6 +41,7 @@ global map<string, integer> Md2Partitions (string md_device); global void DetectDisks (); + global string getBootPartition(); /** * return printable name of bootloader @@ -1558,7 +1559,7 @@ } // EVMS // FIXME: type detection by name deprecated - else if (search (BootPartitionDevice, "/dev/evms/") == 0) + else if (search (getBootPartition(), "/dev/evms/") == 0) { y2milestone ("Cannot install bootloader on EVMS"); return false; @@ -1701,13 +1702,14 @@ } -/** FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 - * Function select boot device - disk - * - * @return string name of boot device - disk +/** + * Function return boot device it means + * return boot partition or root partition if boot partition deosn't exist + * function return "" if boot partition or root partition is not defined (autoyast) + * @return string name of boot device (partition) */ -global string getBootDisk() +global string getBootPartition() { string boot_device = ""; if (BootCommon::BootPartitionDevice != "") @@ -1715,6 +1717,19 @@ else if (BootCommon::RootPartitionDevice != "") boot_device = BootCommon::RootPartitionDevice; + return boot_device; +} + +/** FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + * Function select boot device - disk + * + * @return string name of boot device - disk + */ + +global string getBootDisk() +{ + string boot_device = getBootPartition(); + if (boot_device == "") { y2milestone("BootPartitionDevice and RootPartitionDevice are empty"); -- 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] r49774 - /branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp
by lslezak＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: lslezak Date: Wed Aug 6 15:40:31 2008 New Revision: 49774 URL: http://svn.opensuse.org/viewcvs/yast?rev=49774&view=rev Log: - temporarily initialize the target when doing full refresh to import known GPG keys Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Wed Aug 6 15:40:31 2008 @@ -545,7 +545,12 @@ { // change the architecture ProductCreator::SetArch(new_arch); + + // initialize the target, read trusted GPG keys (needed for refresh) + Pkg::TargetInit("/", true); Pkg::SourceForceRefreshNow(SrcID); + // finish the target + Pkg::TargetFinish(); return true; } } -- 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] r49773 - /branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp
by lslezak＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: lslezak Date: Wed Aug 6 15:35:34 2008 New Revision: 49773 URL: http://svn.opensuse.org/viewcvs/yast?rev=49773&view=rev Log: - preselect the first redaibutton in the arch dialog Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Wed Aug 6 15:35:34 2008 @@ -430,10 +430,13 @@ { term widget = `VBox(); - // TODO: preselect the first item? + boolean preselect = true; + + // preselect the first item foreach(string a, archs, { - widget = add(widget, `MinWidth(25, `Left(`RadioButton(`id(a), a)))); + widget = add(widget, `MinWidth(25, `Left(`RadioButton(`id(a), a, preselect)))); + preselect = false; } ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49772 - /tags/stable-2_17_0/nfs-client/
by kmachalkova＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: kmachalkova Date: Wed Aug 6 15:29:55 2008 New Revision: 49772 URL: http://svn.opensuse.org/viewcvs/yast?rev=49772&view=rev Log: Created tag stable-2_17_0 for nfs-client Added: tags/stable-2_17_0/nfs-client/ - copied from r49771, trunk/nfs-client/ -- 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] r49771 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes
by kmachalkova＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: kmachalkova Date: Wed Aug 6 15:29:49 2008 New Revision: 49771 URL: http://svn.opensuse.org/viewcvs/yast?rev=49771&view=rev Log: version 2.17.0 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=49771&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Wed Aug 6 15:29:49 2008 @@ -1 +1 @@ -2.16.1 +2.17.0 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Wed Aug 6 15:29:49 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Aug 6 15:25:16 CEST 2008 - kmachalkova(a)suse.cz + +- Create correct fstab entries when importing data from AY profile + (regression from FaTE #302031 - now we need to store also fstype + info - nfs vs. nfsv4) (bnc#395850) +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file -- 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] r49770 - /trunk/nfs-client/src/ui.ycp
by kmachalkova＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: kmachalkova Date: Wed Aug 6 15:20:53 2008 New Revision: 49770 URL: http://svn.opensuse.org/viewcvs/yast?rev=49770&view=rev Log: UI facelift Modified: trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=49770&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Wed Aug 6 15:20:53 2008 @@ -218,7 +218,8 @@ `HSpacing(1), `VBox( `VSpacing(0.2), - TextAndButton ( + `HBox( + TextAndButton ( `ComboBox( `id(`serverent),`opt(`editable), // text entry label @@ -228,7 +229,7 @@ // appears in help text too `PushButton (`id (`choose), _("Choo&se")) ), - `HBox( + `HSpacing(0.5), TextAndButton ( `TextEntry(`id(`pathent), // textentry label @@ -238,8 +239,9 @@ // make it short // appears in help text too `PushButton (`id (`pathent_list), _("&Select")) - ), - `HSpacing(0.5), + ) + ), + `Left( TextAndButton ( `TextEntry(`id(`mountent), // textentry label @@ -252,7 +254,7 @@ ), // textentry label `VSpacing(0.2), - `CheckBox(`id(`nfs4), "NFS&v4 Share", nfs4), + `Left( `CheckBox(`id(`nfs4), "NFS&v4 Share", nfs4)), `TextEntry(`id(`optionsent), _("O&ptions"), options), `VSpacing(0.2), `HBox( -- 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] r49769 - /trunk/nfs-client/src/nfs.rnc
by kmachalkova＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: kmachalkova Date: Wed Aug 6 15:12:44 2008 New Revision: 49769 URL: http://svn.opensuse.org/viewcvs/yast?rev=49769&view=rev Log: schema update (new element vfstype - #395850) Modified: trunk/nfs-client/src/nfs.rnc Modified: trunk/nfs-client/src/nfs.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/nfs.rnc?rev=49769… ============================================================================== --- trunk/nfs-client/src/nfs.rnc (original) +++ trunk/nfs-client/src/nfs.rnc Wed Aug 6 15:12:44 2008 @@ -4,6 +4,7 @@ element nfs_entry { element server_path { text } & element mount_point { text } + & element vfstype {text}? & element nfs_options { text } }* } -- 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] r49768 - /trunk/nfs-client/src/Nfs.ycp
by kmachalkova＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: kmachalkova Date: Wed Aug 6 15:06:54 2008 New Revision: 49768 URL: http://svn.opensuse.org/viewcvs/yast?rev=49768&view=rev Log: Create correct nfs fstab entries (do not forget to add filesystem name - nfs, or nfs4) (#395850) Modified: trunk/nfs-client/src/Nfs.ycp Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=49768… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Wed Aug 6 15:06:54 2008 @@ -82,6 +82,7 @@ return($[ "spec":entry["server_path"]:"", "file":entry["mount_point"]:"", + "vfstype":entry["vfstype"]:"", "mntops":entry["nfs_options"]:"" ]); }); @@ -106,12 +107,23 @@ missing = true; } }); + + //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts + //thus we need to keep info on nfs version (v3 vs. v4) + //But older AY profiles might not contain this element + //so let's assume nfsv3 in that case (#395850) + if ( !haskey(s, "vfstype") ) + { + s["vfstype"] = "nfs"; + } + }); if (missing) { return false; } + Set(settings); return true; } @@ -125,6 +137,7 @@ return($[ "server_path":entry["spec"]:"", "mount_point":entry["file"]:"", + "vfstype" :entry["vfstype"]:"", "nfs_options":entry["mntops"]:"" ]); }); -- 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] r49767 - /branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp
by lslezak＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: lslezak Date: Wed Aug 6 14:38:01 2008 New Revision: 49767 URL: http://svn.opensuse.org/viewcvs/yast?rev=49767&view=rev Log: - fixed [Abort] behavior in the config workflow Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Wed Aug 6 14:38:01 2008 @@ -1374,21 +1374,33 @@ */ define symbol packageSelector() { - string base_pattern = ProductCreator::Config["base"]:""; - list<string> patterns = ProductCreator::Config["addons"]:[]; - list<string> packages = ProductCreator::Config["packages"]:[]; - list<string> taboo = ProductCreator::Config["taboo"]:[]; - - map<string,any> result = runPackageSelector(base_pattern, patterns, packages, taboo, `patterns); - - y2debug("Package selector result: %1", result); - - ProductCreator::Config["base"] = result["base"]:""; - ProductCreator::Config["addons"] = result["addons"]:[]; - ProductCreator::Config["packages"] = result["packages"]:[]; - ProductCreator::Config["taboo"] = result["taboo"]:[]; - ProductCreator::Config["code10"] = result["code10"]:true; - ProductCreator::Config["type"] = result["type"]:`patterns; + map<string,any> result = $[]; + + do + { + string base_pattern = ProductCreator::Config["base"]:""; + list<string> patterns = ProductCreator::Config["addons"]:[]; + list<string> packages = ProductCreator::Config["packages"]:[]; + list<string> taboo = ProductCreator::Config["taboo"]:[]; + + result = runPackageSelector(base_pattern, patterns, packages, taboo, `patterns); + + y2debug("Package selector result: %1", result); + + ProductCreator::Config["base"] = result["base"]:""; + ProductCreator::Config["addons"] = result["addons"]:[]; + ProductCreator::Config["packages"] = result["packages"]:[]; + ProductCreator::Config["taboo"] = result["taboo"]:[]; + ProductCreator::Config["code10"] = result["code10"]:true; + ProductCreator::Config["type"] = result["type"]:`patterns; + } + while(result["ui"]:`next == `cancel && !ProductCreator::ReallyAbort()); + + // the package selector returns `cancel when pressing [Abort] + if (result["ui"]:`next == `cancel) + { + return `abort; + } return result["ui"]:`next; } @@ -1475,15 +1487,21 @@ GPGWidgets::SetSelectedPrivateKey(ProductCreator::Config["gpg_key"]:""); } - symbol ret = CWM::ShowAndRun ($[ - "widget_names" : ["sign_checkbox", "select_private_key", "create_new_key"], - "widget_descr" : union(GPGWidgets::Widgets(), sign_checkbox_widget()), - "contents" : GpgDialogContent(), - "caption" : caption, - "back_button" : Label::BackButton (), - "next_button" : Label::NextButton (), - "fallback_functions" : $[] - ]); + symbol ret = nil; + + do + { + ret = CWM::ShowAndRun ($[ + "widget_names" : ["sign_checkbox", "select_private_key", "create_new_key"], + "widget_descr" : union(GPGWidgets::Widgets(), sign_checkbox_widget()), + "contents" : GpgDialogContent(), + "caption" : caption, + "back_button" : Label::BackButton (), + "next_button" : Label::NextButton (), + "fallback_functions" : $[] + ]); + } + while(ret == `abort && !ProductCreator::ReallyAbort()); boolean sign = (boolean)UI::QueryWidget(`id("sign_checkbox"), `Value); y2milestone("Sign the medium: %1", sign); @@ -1612,6 +1630,12 @@ repeat { ret = UI::UserInput(); + + if (ret == `abort && !ProductCreator::ReallyAbort()) + { + // abort canceled + ret = `dummy; + } } until (ret == `next || ret == `back || ret == `abort); Wizard::CloseDialog(); -- 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] r49766 - in /trunk/yast2: library/wizard/src/Wizard.ycp package/yast2.changes
by tgoettlicher＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: tgoettlicher Date: Wed Aug 6 14:37:05 2008 New Revision: 49766 URL: http://svn.opensuse.org/viewcvs/yast?rev=49766&view=rev Log: Fixed bnc #413516: HideBackButton() always hides back button in wizard Modified: trunk/yast2/library/wizard/src/Wizard.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/wizard/src/Wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Wizard.… ============================================================================== --- trunk/yast2/library/wizard/src/Wizard.ycp (original) +++ trunk/yast2/library/wizard/src/Wizard.ycp Wed Aug 6 14:37:05 2008 @@ -785,47 +785,6 @@ Wizard::SetContents("", `Empty(), "", false, false); } - - /** - * Set contents and Buttons of wizard dialog - * - * Additionally set its title, help_text and buttons labels. Enables both back and next button. - * - * @params - * - * @param title title of window - * @param contents contents of dialog - * @param help_text help text - * @param back_label label of back button - * @param next_label label of next button - **/ - global void SetContentsButtons( string title, - term contents, - string help_text, - string back_label, - string next_label ) - { - UI::PostponeShortcutCheck (); - - if ( UI::WizardCommand(`SetBackButtonLabel( back_label ) ) == true ) - { - UI::WizardCommand(`SetNextButtonLabel( next_label ) ); - Wizard::SetContents( title, contents, help_text, true, true ); - } - else - { - // Set button labels first to avoid geometry problems: SetContents() - // calls ReplaceWidget() wich triggers a re-layout. - - if ( UI::WidgetExists(`id(`back ) ) ) UI::ChangeWidget(`id (`back), `Label, back_label); - if ( UI::WidgetExists(`id(`next ) ) ) UI::ChangeWidget(`id (`next), `Label, next_label); - Wizard::SetContents( title, contents, help_text, true, true ); - } - SetHelpText( help_text ); - UI::CheckShortcuts (); - } - - /** * Set the dialog's "Next" button with a new label and a new ID * @@ -991,6 +950,53 @@ } + + /** + * Set contents and Buttons of wizard dialog + * + * Additionally set its title, help_text and buttons labels. Enables both back and next button. + * + * @params + * + * @param title title of window + * @param contents contents of dialog + * @param help_text help text + * @param back_label label of back button + * @param next_label label of next button + **/ + global void SetContentsButtons( string title, + term contents, + string help_text, + string back_label, + string next_label ) + { + + + UI::PostponeShortcutCheck (); + + Wizard::RestoreBackButton(); + Wizard::RestoreNextButton(); + + if ( UI::WizardCommand(`SetBackButtonLabel( back_label ) ) == true ) + { + UI::WizardCommand(`SetNextButtonLabel( next_label ) ); + Wizard::SetContents( title, contents, help_text, true, true ); + } + else + { + // Set button labels first to avoid geometry problems: SetContents() + // calls ReplaceWidget() wich triggers a re-layout. + + if ( UI::WidgetExists(`id(`back ) ) ) UI::ChangeWidget(`id (`back), `Label, back_label); + if ( UI::WidgetExists(`id(`next ) ) ) UI::ChangeWidget(`id (`next), `Label, next_label); + Wizard::SetContents( title, contents, help_text, true, true ); + } + SetHelpText( help_text ); + UI::CheckShortcuts (); + + } + + /** * Sets the wizard 'title' icon to the specified icon from the standard icon * directory. 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 Wed Aug 6 14:37:05 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 6 14:23:14 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #413516: HideBackButton() always hides back button + in wizard + +------------------------------------------------------------------- Wed Aug 6 10:34:07 CEST 2008 - locilka(a)suse.cz - Converting old built-in allowed services configuration in -- 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] r49765 - in /trunk/mail/src: MailServerLDAP.pm YaPI/MailServer.pm mail-server_dialogs.ycp
by varkoly＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: varkoly Date: Wed Aug 6 14:26:55 2008 New Revision: 49765 URL: http://svn.opensuse.org/viewcvs/yast?rev=49765&view=rev Log: including changes from rhafer considering the yast2-ldap-server make the count of amavisd processes variable Modified: trunk/mail/src/MailServerLDAP.pm trunk/mail/src/YaPI/MailServer.pm trunk/mail/src/mail-server_dialogs.ycp Modified: trunk/mail/src/MailServerLDAP.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServerLDAP.pm?rev=4… ============================================================================== --- trunk/mail/src/MailServerLDAP.pm (original) +++ trunk/mail/src/MailServerLDAP.pm Wed Aug 6 14:26:55 2008 @@ -39,58 +39,29 @@ { my $ldapMap = YaPI::LdapServer->ReadDatabaseList(); # Now we configure the LDAP-Server to be able store the mail server configuration - my $schemas = YaPI::LdapServer->ReadSchemaIncludeList(); + my $schemas = YaPI::LdapServer->ReadSchemaList(); my $SCHEMA = join "",@{$schemas}; - if( $SCHEMA !~ /dnszone.schema/ ) + + if( $SCHEMA !~ /dnszone/ ) { - push @{$schemas},'/etc/openldap/schema/dnszone.schema'; + YaPI::LdapServer->AddSchema('/etc/openldap/schema/dnszone.schema'); } - if( $SCHEMA !~ /suse-mailserver.schema/ ) + if( $SCHEMA !~ /suse-mailserver/ ) { - push @{$schemas},'/etc/openldap/schema/suse-mailserver.schema'; - YaPI::LdapServer->WriteSchemaIncludeList($schemas); + YaPI::LdapServer->AddSchema('/etc/openldap/schema/suse-mailserver.schema'); } - my $indices = YaPI::LdapServer->ReadIndex($ldapMap->[0]); - my $SuSEMailClient = 0; - my $SuSEMailDomainMasquerading = 0; - my $suseTLSPerSitePeer= 0; - foreach my $index (@{$indices}) - { - if( $index->{attr} eq "SuSEMailClient,SUSEMailAcceptAddress,zoneName") - { - $SuSEMailClient = 1; - } - if( $index->{attr} eq "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType") - { - $SuSEMailDomainMasquerading = 1; + + my $indices = YaPI::LdapServer->ReadIndex( $ldapMap->[2]->{'suffix'} ); + my @attrs = ( "SuSEMailClient", "SUSEMailAcceptAddress", "zoneName", + "SuSEMailDomainMasquerading", "relativeDomainName", "suseMailDomainType", + "suseTLSPerSitePeer", "SuSEMailTransportDestination" ); + foreach my $attr (@attrs){ + my $curindex; + if (! defined $indices->{$attr} ) { + $curindex->{'name'} = $attr; + $curindex->{'eq'} = 1; + YaPI::LdapServer->EditIndex($ldapMap->[2]->{'suffix'}, $curindex ); } - if( $index->{attr} eq "suseTLSPerSitePeer,SuSEMailTransportDestination") - { - $suseTLSPerSitePeer = 1; - } - } - if(!$SuSEMailClient) - { - YaPI::LdapServer->AddIndex($ldapMap->[0], - { "attr" => "SuSEMailClient,SUSEMailAcceptAddress,zoneName", - "param" => "eq" } - ); - } - if(!$SuSEMailDomainMasquerading) - { - YaPI::LdapServer->AddIndex($ldapMap->[0], - { "attr" => "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType", - "param" => "eq" } - ); - } - if(!$suseTLSPerSitePeer) - { - YaPI::LdapServer->AddIndex($ldapMap->[0], - { "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination", - "param" => "eq" } - ); } - YaPI::LdapServer->RecreateIndex($ldapMap->[0]); - Service->Restart("ldap"); - return YaPI::LdapServer->ReadDatabase($ldapMap->[0]); + return YaPI::LdapServer->ReadDatabase($ldapMap->[2]->{'suffix'}); } Modified: trunk/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=… ============================================================================== --- trunk/mail/src/YaPI/MailServer.pm (original) +++ trunk/mail/src/YaPI/MailServer.pm Wed Aug 6 14:26:55 2008 @@ -56,9 +56,10 @@ my $proposal_valid = 0; ## - # Some global variables for cyrus-imapd -my $imapadm = "cyrus"; -my $imaphost = "localhost"; + # Some global variables +my $imapadm = "cyrus"; +my $imaphost = "localhost"; +my $aconf = "/etc/amavisd.conf"; ## # Write only, used during autoinstallation. @@ -1048,6 +1049,7 @@ 'RBLList' => [], 'AccessList' => [], 'VirusScanning' => 1, + 'VSCount' => 10 'SpamLearning' => 1 ); @@ -1094,6 +1096,7 @@ 'RBLList' => [], 'AccessList' => [], 'VirusScanning' => YaST::YCP::Boolean(0), + 'VSCount' => 10, 'SpamLearning' => YaST::YCP::Boolean(0) ); @@ -1169,8 +1172,28 @@ if( $smtp->[0]->{'options'}->{'content_filter'} eq 'smtp:[localhost]:10024' && $vscan ) { $MailPrevention{'VirusScanning'} = YaST::YCP::Boolean(1); + if( ! open(IN,$aconf) ) + { + return "Error: $!"; + } + my @ACONF = <IN>; + close(IN); + my $ismax = 0; + foreach ( @ACONF ) + { + s/\s+//g; + if ( /^\$max_servers=(\d+)/ ) + { + $MailPrevention{'VSCount'} = $1; + } + } + if( !$ismax ) + { + $MailPrevention{'VSCount'} = 2; + } } } + # make IMAP connection my $imap = new Net::IMAP($imaphost, Debug => 0); if( $imap ) @@ -1335,7 +1358,7 @@ SCR->Read('.mail.postfix.mastercf'); if( $MailPrevention->{'VirusScanning'} ) { - my $err = activate_virus_scanner(); + my $err = activate_virus_scanner($MailPrevention->{'VSCount'}); if( $err ne "" ) { return $self->SetError(summary => "activating virus scanner failed", @@ -1348,7 +1371,7 @@ SCR->Execute('.mail.postfix.mastercf.modifyService', { 'service' => 'smtp', 'command' => 'smtpd', - 'maxproc' => '5', + 'maxproc' => $MailPrevention->{'VSCount'}, 'options' => { 'content_filter' => 'smtp:[127.0.0.1]:10024' } } ); } else @@ -1356,7 +1379,7 @@ SCR->Execute('.mail.postfix.mastercf.addService', { 'service' => 'smtp', 'command' => 'smtpd', - 'maxproc' => '5', + 'maxproc' => $MailPrevention->{'VSCount'}, 'options' => { 'content_filter' => 'smtp:[127.0.0.1]:10024' } } ); } my $smtps = SCR->Execute('.mail.postfix.mastercf.findService', @@ -2805,9 +2828,9 @@ sub activate_virus_scanner { + my $VSCount = shift || 5; use File::Copy; - my $aconf = "/etc/amavisd.conf"; my $cconf = "/etc/clamd.conf"; my $clamsock = '/var/lib/clamav/clamd-socket'; my @CONF = (); @@ -2823,7 +2846,7 @@ my $ismax = 0; foreach my $l ( @ACONF ) { - $ismax = 1 if $l =~ s/^\$max_servers = \d+/\$max_servers = 5/; + $ismax = 1 if $l =~ s/^\$max_servers = \d+/\$max_servers = $VSCount/; $l =~ s/(.*)/# $1/ if $l =~ /bypass_virus_checks_acl.*=.*qw\( \./; if( $isclam || $l =~ /Clam Antivirus-clamd/ ) { @@ -2839,7 +2862,7 @@ } if( !$ismax ) { - push @CONF, '$max_servers = 5;' + push @CONF, '$max_servers = '.$VSCount; } if( ! open(OUT,">$aconf.new") ) { Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp… ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Wed Aug 6 14:26:55 2008 @@ -660,7 +660,8 @@ list<string> RBLList = (list<string>) MailServer::MailPrevention["RBLList"]:[]; list<map<string,string> > AccessList = (list<map<string,string> >) MailServer::MailPrevention["AccessList"]:[]; boolean VirusScanning = (boolean)MailServer::MailPrevention["VirusScanning"]:false; - boolean SpamLearning = (boolean)MailServer::MailPrevention["SpamLearning "]:false; + boolean SpamLearning = (boolean)MailServer::MailPrevention["SpamLearning"]:false; + integer VSCount = (integer)MailServer::MailPrevention["VSCount "]:10; boolean BasicProtectionOff = false; boolean BasicProtectionMedium = false; boolean BasicProtectionHard = true; @@ -692,7 +693,11 @@ SpamL = `Left(`CheckBox (`id(`SpamLearning), `opt(`notify), _("Configure Spam Learning Extension"), SpamLearning)); } term content = `VBox ( - `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), + `HBox( + `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), + `HSpacing (1), + `Left(`CheckBox (`id(`VSCount), `opt(`notify), _("Count of Virsus Scanner Process"), VSCount)) + ), `VSpacing (1), SpamL, `VSpacing (1), @@ -1416,6 +1421,7 @@ if( ret == `SpamLearning ) { MailServer::MailPrevention["Changed"] = true; UI::ChangeWidget(`id(`VirusScanning), `Value, true); + UI::ChangeWidget(`id(`VSCount), `Value, 10); continue; } if(ret == `RBLAdd) { @@ -1452,9 +1458,10 @@ } }); } - MailServer::MailPrevention["BasicProtection"] = (string)UI::QueryWidget(`id(`BasicProtection), `CurrentButton); - MailServer::MailPrevention["VirusScanning"] = (boolean) UI::QueryWidget(`id(`VirusScanning), `Value); - MailServer::MailPrevention["SpamLearnig"] = (boolean) UI::QueryWidget(`id(`SpamLearning), `Value); + MailServer::MailPrevention["BasicProtection"] = (string) UI::QueryWidget(`id(`BasicProtection), `CurrentButton); + MailServer::MailPrevention["VirusScanning"] = (boolean)UI::QueryWidget(`id(`VirusScanning), `Value); + MailServer::MailPrevention["SpamLearning"] = (boolean)UI::QueryWidget(`id(`SpamLearning), `Value); + MailServer::MailPrevention["VSCount"] = (boolean)UI::QueryWidget(`id(`VSCount), `Value); title = _("Mail Server SPAM Basic Prevention Configuration"); content = MailPreventionDialog(CID,CIDRBL); helptext = HELPS["MailPrevention"]:"Bla Bla Bla"; -- 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] r49764 - in /trunk/installation: control/docs/control-section.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: locilka Date: Wed Aug 6 14:06:09 2008 New Revision: 49764 URL: http://svn.opensuse.org/viewcvs/yast?rev=49764&view=rev Log: - Adjusted control file documentation. Modified: trunk/installation/control/docs/control-section.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/docs/control-section.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/contro… ============================================================================== --- trunk/installation/control/docs/control-section.xml (original) +++ trunk/installation/control/docs/control-section.xml Wed Aug 6 14:06:09 2008 @@ -393,6 +393,13 @@ <listitem><para>(boolean) <emphasis>rle_offer_rulevel_4</emphasis> - defines whether runlevel 4 should be offered in Runlevel Editor. Defaul value is <emphasis>false</emphasis> if not set.</para></listitem> + +  + <listitem><para>(boolean) <emphasis>enable_kdump</emphasis> - defines whether + kdump is proposed as <emphasis>enabled</emphasis> in installation proposal. + <emphasis>kdump_proposal</emphasis> client call has to be added into + <link linkend="control_proposals">proposal</link> otherwise this variable + does not have any effect.</para></listitem> </itemizedlist> </section> 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 Wed Aug 6 14:06:09 2008 @@ -3,6 +3,7 @@ - New control file entry globals->enable_kdump (default value) (FATE #303893). +- Adjusted control file documentation. ------------------------------------------------------------------- Tue Aug 5 11:48:44 CEST 2008 - locilka(a)suse.cz -- 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] r49763 - in /trunk/installation: control/control.SLES.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: locilka Date: Wed Aug 6 13:54:59 2008 New Revision: 49763 URL: http://svn.opensuse.org/viewcvs/yast?rev=49763&view=rev Log: - New control file entry globals->enable_kdump (default value) (FATE #303893). Modified: trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Wed Aug 6 13:54:59 2008 @@ -48,6 +48,9 @@  <rle_offer_rulevel_4 config:type="boolean">true</rle_offer_rulevel_4> + +  + <enable_kdump config:type="boolean">true</enable_kdump> </globals> <software> 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 Wed Aug 6 13:54:59 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 6 13:54:07 CEST 2008 - locilka(a)suse.cz + +- New control file entry globals->enable_kdump (default value) + (FATE #303893). + +------------------------------------------------------------------- Tue Aug 5 11:48:44 CEST 2008 - locilka(a)suse.cz - Calling reiplauto client in SLES control file before reboot -- 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] r49762 - in /branches/tmp/lslezak/product-creator-cross-arch/src: complex.ycp dialogs.ycp
by lslezak＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: lslezak Date: Wed Aug 6 13:29:44 2008 New Revision: 49762 URL: http://svn.opensuse.org/viewcvs/yast?rev=49762&view=rev Log: - set arch before mastering ISO Modified: branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp Wed Aug 6 13:29:44 2008 @@ -480,6 +480,12 @@ boolean success = true; + string arch = ProductCreator::Config["arch"]:""; + if (arch != nil && arch != "") + { + ProductCreator::SetArch(arch); + } + Progress::NextStage(); Pkg::TargetFinish (); Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Wed Aug 6 13:29:44 2008 @@ -1381,6 +1381,8 @@ map<string,any> result = runPackageSelector(base_pattern, patterns, packages, taboo, `patterns); + y2debug("Package selector result: %1", result); + ProductCreator::Config["base"] = result["base"]:""; ProductCreator::Config["addons"] = result["addons"]:[]; ProductCreator::Config["packages"] = result["packages"]:[]; -- 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] r49761 - /tags/stable-2_17_10/bootloader/
by juhliarik＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: juhliarik Date: Wed Aug 6 13:05:37 2008 New Revision: 49761 URL: http://svn.opensuse.org/viewcvs/yast?rev=49761&view=rev Log: Created tag stable-2_17_10 for bootloader Added: tags/stable-2_17_10/bootloader/ - copied from r49760, trunk/bootloader/ -- 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] r49760 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: juhliarik Date: Wed Aug 6 13:05:29 2008 New Revision: 49760 URL: http://svn.opensuse.org/viewcvs/yast?rev=49760&view=rev Log: new version 2.17.10 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=49760&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Wed Aug 6 13:05:29 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Wed Aug 6 13:05:29 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Aug 6 12:55:17 CEST 2008 - juhliarik(a)suse.cz + +- added support for acoustic signals (fate #303481) +- added checkbox for enabling remapping in chainloader section +- 2.17.10 + +------------------------------------------------------------------- Tue Aug 5 12:05:04 CEST 2008 - juhliarik(a)suse.cz - added/enabled support for ordering disks in device.map for GRUB -- 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] r49759 - /tags/stable-2_17_17/network/
by mzugec＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: mzugec Date: Wed Aug 6 13:01:28 2008 New Revision: 49759 URL: http://svn.opensuse.org/viewcvs/yast?rev=49759&view=rev Log: Created tag stable-2_17_17 for network Added: tags/stable-2_17_17/network/ - copied from r49758, trunk/network/ -- 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] r49758 - /tags/stable-2_17_17/
by mzugec＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: mzugec Date: Wed Aug 6 13:01:26 2008 New Revision: 49758 URL: http://svn.opensuse.org/viewcvs/yast?rev=49758&view=rev Log: Created tag stable-2_17_17 Added: tags/stable-2_17_17/ -- 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] r49757 - in /trunk/network: VERSION package/yast2-network.changes src/provider/connection.ycp
by mzugec＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: mzugec Date: Wed Aug 6 13:01:11 2008 New Revision: 49757 URL: http://svn.opensuse.org/viewcvs/yast?rev=49757&view=rev Log: increase default idle time-out for modem connection (fate#303429) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/provider/connection.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=49757&r1=497… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Aug 6 13:01:11 2008 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Aug 6 13:01:11 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 6 13:00:12 CEST 2008 - mzugec(a)suse.cz + +- increase default idle time-out for modem connection (fate#303429) +- 2.17.17 + +------------------------------------------------------------------- Wed Aug 6 09:18:00 CEST 2008 - mzugec(a)suse.cz - installation via wireless (bnc#223570) Modified: trunk/network/src/provider/connection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/provider/connection.… ============================================================================== --- trunk/network/src/provider/connection.ycp (original) +++ trunk/network/src/provider/connection.ycp Wed Aug 6 13:01:11 2008 @@ -48,7 +48,7 @@ string DNS1 = Provider::Current["DNS1"]:""; string DNS2 = Provider::Current["DNS2"]:""; - string idletime = Provider::Current["IDLETIME"]:"300"; + string idletime = Provider::Current["IDLETIME"]:"900"; string device = nil; string dtype = nil; @@ -168,7 +168,8 @@ seconds = add(seconds, idletime); seconds = maplist(string e, (list<string>) seconds, { - return `item(`id(sformat("%1", e)), sformat("%1", e), e == idletime); + // translators: min - shortcut to "minutes" (fate#303429) + return `item(`id(sformat("%1", e)), sformat("%1 (%2 %3)", e, tofloat(e)/60, _("min")), e == idletime); }); /* Checkbox label */ -- 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] r49756 - in /trunk/bootloader/src: generic/section_edit_widgets.ycp generic/wizards.ycp grub/helps.ycp modules/BootGRUB.ycp modules/GfxMenu.ycp
by juhliarik＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: juhliarik Date: Wed Aug 6 12:52:37 2008 New Revision: 49756 URL: http://svn.opensuse.org/viewcvs/yast?rev=49756&view=rev Log: - added checkbox for enabling remaping of chainloader section - added support for acoustic signal in gfxboot (fate #303481) M bootloader/src/grub/helps.ycp * added help text M bootloader/src/modules/GfxMenu.ycp * added function enableAcousticSignal() M bootloader/src/modules/BootGRUB.ycp M bootloader/src/generic/section_edit_widgets.ycp M bootloader/src/generic/wizards.ycp * added checkbox Modified: trunk/bootloader/src/generic/section_edit_widgets.ycp trunk/bootloader/src/generic/wizards.ycp trunk/bootloader/src/grub/helps.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/GfxMenu.ycp Modified: trunk/bootloader/src/generic/section_edit_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/section_e… ============================================================================== --- trunk/bootloader/src/generic/section_edit_widgets.ycp (original) +++ trunk/bootloader/src/generic/section_edit_widgets.ycp Wed Aug 6 12:52:37 2008 @@ -45,7 +45,8 @@ // extract edit dialog discription for a specific type of section map<string,any> SE_Options (string type) { map<string,any> se_options = nil; - + // HACK: add checkbox for mapping chainloader section to the first disk in order + BootCommon::section_options["other_remap"]="bool:Remap section to the first disk in device map:false"; se_options = mapmap( string key, any value, filter( string key, any value, BootCommon::section_options, Modified: trunk/bootloader/src/generic/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/wizards.y… ============================================================================== --- trunk/bootloader/src/generic/wizards.ycp (original) +++ trunk/bootloader/src/generic/wizards.ycp Wed Aug 6 12:52:37 2008 @@ -89,7 +89,7 @@ "contents" : contents, "caption" : _("Boot Loader Settings: Section Management"), "back_button" : Label::BackButton (), - "abort_button" : Label::AbortButton (), + "abort_button" : Label::CancelButton (), "next_button" : Label::OKButton (), "fallback_functions" : section_handlers, ]); Modified: trunk/bootloader/src/grub/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/helps.ycp?re… ============================================================================== --- trunk/bootloader/src/grub/helps.ycp (original) +++ trunk/bootloader/src/grub/helps.ycp Wed Aug 6 12:52:37 2008 @@ -122,6 +122,8 @@ _("Partition of Menu File"), "menu_configfile" : _("Menu Description File"), + "other_remap" : + _("Map Section to the First Disk from Device Map Windows usually need to be on the first disk."), ]; @@ -157,6 +159,7 @@ "other_noverifyroot" : _("Do not verify Filesystem before Booting"), "other_makeactive" : _("Activate this Partition when selected for Boot"), "other_blockoffset" : _("Block Offset for Chainloading"), + "other_remap" : _("Map Section to the First Disk in Device Map"), "type_xen" : _("Xen Section"), "xen_xen" : _("Hypervisor"), "xen_xen_append" : _("Additional Xen Hypervisor Parameters"), Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Wed Aug 6 12:52:37 2008 @@ -609,6 +609,10 @@ // if that points to a section that does not exist anymore BootCommon::FixGlobals (); } + + // check if windows is on second disk and add remap if it is necessary + // FATE #301994: Correct device mapping in case windows is installed on the second HD + BootCommon::sections = checkWindowsSection(BootCommon::sections); y2milestone ("Proposed sections: %1", BootCommon::sections); y2milestone ("Proposed globals: %1", BootCommon::globals); @@ -625,10 +629,6 @@ */ global boolean Save (boolean clean, boolean init, boolean flush) { - // check if windows is on second disk and add remap if it is necessary - // FATE #301994: Correct device mapping in case windows is installed on the second HD - BootCommon::sections = checkWindowsSection(BootCommon::sections); - // reduce device map to 8 devices // FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 ReduceDeviceMapTo8(); Modified: trunk/bootloader/src/modules/GfxMenu.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/GfxMenu.y… ============================================================================== --- trunk/bootloader/src/modules/GfxMenu.ycp (original) +++ trunk/bootloader/src/modules/GfxMenu.ycp Wed Aug 6 12:52:37 2008 @@ -284,6 +284,21 @@ return ret; } + + +/** FATE #303481: Acoustic signal for bootloader when booting from installation medium + * Function enables acoustic signals for bootloader + * + */ + +define void enableAcousticSignal() +{ + y2milestone("Enable acoustic signals for boot menu"); + string command = "gfxboot --change-config boot::beep=1"; + map ret = (map)SCR::Execute (.target.bash_output, command); + y2milestone ("Result of command: %1 result: %2",command, ret); +} + /** * Update graphical bootloader to contain translations for section labels in * the currently selected installation language (set in @@ -294,6 +309,10 @@ */ global define boolean UpdateGfxMenuContents (string loader) { y2milestone ("Updating GFX boot menu"); + + // FATE #303481 enable acoustic signals for bootloader + enableAcousticSignal(); + // if the boot menu does not exist, return without updating it if (SCR::Read (.target.size, "/boot/message") == -1) return true; -- 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] r49755 - in /branches/tmp/lslezak/product-creator-cross-arch/src: ProductCreator.ycp complex.ycp dialogs.ycp wizards.ycp
by lslezak＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: lslezak Date: Wed Aug 6 12:50:41 2008 New Revision: 49755 URL: http://svn.opensuse.org/viewcvs/yast?rev=49755&view=rev Log: - ask user to switch to another architecture if the selected repository is not compatible with the current machine - save arch flag to the config Modified: branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp branches/tmp/lslezak/product-creator-cross-arch/src/wizards.ycp Modified: branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/ProductCreator.ycp Wed Aug 6 12:50:41 2008 @@ -26,6 +26,7 @@ import "Directory"; import "Profile"; import "AutoinstSoftware"; +// NOTE: do not use Arch:: directly in this module, use GetArch() function instead! import "Arch"; import "Package"; import "PackageAI"; @@ -93,6 +94,51 @@ */ global block<boolean> AbortFunction = nil; + +/* + Target architecture +*/ + +string _arch = Arch::architecture(); + +/** + Set the target archiotecture + @param new_arch new architecture (i386, sparc, sparc64, mips, mips64, ppc, ppc64, alpha, s390_32, s390_64, ia64, x86_64) + @return true on success +*/ +global boolean SetArch(string new_arch) +{ + if (!contains(["i386", "sparc", "sparc64", "mips", "mips64", "ppc", "ppc64", "alpha", "s390_32", "s390_64", "ia64", "x86_64"], new_arch)) + { + y2error("Unknown architecture '%1'!", new_arch); + return false; + } + + _arch = new_arch; + y2milestone("Target architecture set to '%1'", new_arch); + + // set the architecture in the package manager + Pkg::SetArchitecture(_arch); + + return true; +} + +global string GetArch() +{ + return _arch; +} + +global void ResetArch() +{ + _arch = Arch::architecture(); + y2milestone("Resetting the target architecture to '%1'", _arch); + + // set the architecture in the package manager + Pkg::SetArchitecture(_arch); +} + + + /** * Data was modified? */ @@ -178,7 +224,7 @@ global boolean isCode10Source() { boolean code10 = false; - string arch = Arch::architecture (); + string arch = GetArch(); if (arch == "s390_64") arch = "s390x"; foreach (string url , ProductCreator::Config["sources"]:[], { @@ -619,7 +665,7 @@ } else { - string arch = Arch::architecture(); + string arch = GetArch(); if (arch == "s390_64") arch = "s390x"; bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", arch); @@ -1356,7 +1402,7 @@ string sles_path = ""; integer sles_src = 0; string descr_dir = ""; - string arch = Arch::architecture(); + string arch = GetArch(); if (arch == "s390_64") arch = "s390x"; y2milestone("Config: %1", Config); @@ -1390,7 +1436,7 @@ if (bootable_product) { - if (Arch::i386() || Arch::x86_64()) + if (_arch == "i386" || _arch == "x86_64") { if (Config["code10"]:false) { @@ -1401,7 +1447,7 @@ Exec(sformat("/bin/mkdir -p '%1/boot/loader'", String::Quote(skel_root))); } } - else if (Arch::ppc() || Arch::ppc64()) + else if (_arch == "ppc" || _arch == "ppc64") { Exec(sformat("/bin/mkdir -p '%1/PS3'", String::Quote(skel_root))); Exec(sformat("/bin/mkdir -p '%1/ppc'", String::Quote(skel_root))); @@ -1473,7 +1519,7 @@ CopyFile(id, 1, "boot/rescue", sformat("%1/boot", skel_root)); } // Loader, x86 specific - if (Arch::i386() || Arch::x86_64()) + if (_arch == "i386" || _arch == "x86_64") { if (Config["code10"]:false) { @@ -1489,7 +1535,7 @@ CopyDirectoryRec(id, 1, "boot/loader", sformat("%1/boot", skel_root)); } } - else if (Arch::ppc() || Arch::ppc64()) + else if (_arch == "ppc" || _arch == "ppc64") { // recursive copy of /boot CopyDirectoryRec(id, 1, "boot", skel_root); @@ -1503,7 +1549,7 @@ { CopyDirectoryRec(id, 1, "boot", skel_root); - if (Arch::ppc() || Arch::ppc64()) + if (_arch == "ppc" || _arch == "ppc64") { CopyPPCBoot(id, skel_root); } @@ -1643,7 +1689,7 @@ } // Loader, x86 specific - if (Arch::i386() || Arch::x86_64()) + if (_arch == "i386" || _arch == "x86_64") { if (Config["code10"]:false) { @@ -1659,7 +1705,7 @@ CopyDirectoryRec(base_source, 1, "boot/loader", sformat("%1/boot", skel_root)); } } - else if (Arch::ppc() || Arch::ppc64()) + else if (_arch == "ppc" || _arch == "ppc64") { CopyPPCBoot(base_source, skel_root); @@ -1676,7 +1722,7 @@ { CopyDirectoryRec(base_source, 1, "boot", skel_root); - if (Arch::ppc() || Arch::ppc64()) + if (_arch == "ppc" || _arch == "ppc64") { CopyPPCBoot(base_source, skel_root); } @@ -2268,7 +2314,7 @@ global define boolean CopyMiscFiles() ``{ string cpCmd = ""; - string arch = Arch::architecture(); + string arch = GetArch(); if (arch == "s390_64") arch = "s390x"; y2debug("isolinux.cfg: %1", Config["bootconfig"]:"" ); if (Config["bootconfig"]:"" != "") Modified: branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/complex.ycp Wed Aug 6 12:50:41 2008 @@ -11,7 +11,6 @@ textdomain "product-creator"; - import "Arch"; import "CommandLine"; import "Directory"; import "FileUtils"; @@ -303,7 +302,7 @@ y2debug("bootconfig available"); string fname = (ProductCreator::Config["code10"]:false) - ? sformat("%1/boot/%2/loader/isolinux.cfg", ProductCreator::skel_root, Arch::architecture()) + ? sformat("%1/boot/%2/loader/isolinux.cfg", ProductCreator::skel_root, ProductCreator::GetArch()) : sformat("%1/boot/loader/isolinux.cfg", ProductCreator::skel_root); SCR::Write(.target.string, fname, ProductCreator::Config["bootconfig"]:"" ); @@ -369,7 +368,7 @@ { Popup::ShowFeedback(_("Creating CD Image..."), _("This may take a while")); } - string arch = Arch::architecture (); + string arch = ProductCreator::GetArch(); if (arch == "s390_64") arch = "s390x"; string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote((ProductCreator::Config["code10"]:false) ? arch : "")); @@ -552,7 +551,7 @@ // skip isolinux configuration if the architecture // is not i386 or x86_64 - there is no isolinux - if (Arch::architecture() != "i386" && Arch::architecture() != "x86_64") + if (ProductCreator::GetArch() != "i386" && ProductCreator::GetArch() != "x86_64") { return `skip_isolinux; } Modified: branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/dialogs.ycp Wed Aug 6 12:50:41 2008 @@ -16,7 +16,6 @@ import "SourceManager"; import "Report"; import "URL"; - import "Arch"; import "Label"; import "Popup"; import "URL"; @@ -25,6 +24,7 @@ import "CWM"; import "String"; import "Package"; + import "Arch"; include "product-creator/routines.ycp"; include "product-creator/helps.ycp"; @@ -198,6 +198,13 @@ } else if(ret == `next ) { + // set architecture if configured + string arch = ProductCreator::Config["arch"]:""; + if (arch != nil && arch != "") + { + ProductCreator::SetArch(arch); + } + string name = (string)UI::QueryWidget(`id(`name), `Value); if (name == "") @@ -419,6 +426,131 @@ return (symbol)ret; } +string AskArch(list<string> archs) +{ + term widget = `VBox(); + + // TODO: preselect the first item? + foreach(string a, archs, + { + widget = add(widget, `MinWidth(25, `Left(`RadioButton(`id(a), a)))); + } + ); + + term content = `MarginBox(1, 0.5, + `VBox( + `Label(sformat(_("The source does not support the architecture of this machine (%1). +Change the target architecture? +"), Arch::architecture())), + `VSpacing(1), + `Frame(_("Target Architecture"), + `RadioButtonGroup(`id(`rb), + widget + ) + ), + `VSpacing(1), + `HBox( + `PushButton(`id(`change), _("Change Architecture")), + `HSpacing(1), + `PushButton(`id(`cancel), Label::CancelButton()) + ) + ) + ); + + UI::OpenDialog(content); + + any ui = UI::UserInput(); + string ret = (string)UI::QueryWidget(`id(`rb), `CurrentButton); + + UI::CloseDialog(); + + if (ui == `cancel) + { + // canceled + return nil; + } + else + { + y2milestone("Selected architecture: %1", ret); + return ret; + } +} + + +boolean CheckArchitecture(integer SrcID) +{ + map general_info = Pkg::SourceGeneralData(SrcID); + boolean found_architecture = false; + list<string> found_archs = []; + + string arch = ProductCreator::GetArch(); + if (arch == "s390_64") arch = "s390x"; + + // architecture check is possible only for YaST sources + if (general_info["type"]:"" == "YaST") + { + // Check architecture + map<string,string> read_content = ProductCreator::ReadContentFile(SrcID); + y2milestone("content file: %1", read_content); + + foreach(string key, string value, read_content, + { + if (key == "ARCH." + arch) + { + found_architecture = true; + break; + } + else + { + string found_arch = regexpsub(key, "ARCH\\.(.*)", "\\1"); + + if (found_arch != nil) + { + found_archs = add(found_archs, found_arch); + } + } + } + ); + } + else + { + y2milestone("Not a YaST source, cannot verify the architecture"); + found_architecture = true; + } + + y2milestone("Architecture %1 is supported: %2", arch, found_architecture); + + if (found_architecture) + { + return true; + } + else + { + y2milestone("Supported architectures: %1", found_archs); + + if (size(found_archs) == 0) + { + y2milestone("The repository does not provide architecture data, assuming it is compatible"); + return true; + } + + // the architecture is different, ask to switch + string new_arch = AskArch(found_archs); + + // nil == switch has been canceled + if (new_arch != nil) + { + // change the architecture + ProductCreator::SetArch(new_arch); + Pkg::SourceForceRefreshNow(SrcID); + return true; + } + } + + return false; +} + + /** * Dialog for selecting the sources * @return symbol @@ -489,43 +621,17 @@ else if (ret == `select) { integer SrcID = (integer)UI::QueryWidget(`id(`table), `CurrentItem); - map general_info = Pkg::SourceGeneralData(SrcID); - boolean found_architecture = false; - string arch = Arch::architecture (); - if (arch == "s390_64") arch = "s390x"; + boolean repo_ok = CheckArchitecture(SrcID); - // architecture check is possible only for YaST sources - if (general_info["type"]:"" == "YaST") - { - // Check architecture - map<string,string> read_content = ProductCreator::ReadContentFile(SrcID); - y2milestone("content file: %1", read_content); - - foreach(string key, string value, read_content, - { - if (key == "ARCH." + arch) - { - found_architecture = true; - break; - } - } - ); - } - else - { - y2milestone("Not a YaST source, cannot verify the architecture"); - found_architecture = true; - } - - y2milestone("Architecture %1 is supported: %2", arch, found_architecture); - - if (found_architecture) + if (repo_ok) { if (!contains(selected_items, SrcID)) { selected_items = add (selected_items, SrcID ); + map general_info = Pkg::SourceGeneralData(SrcID); + // enable the source if (general_info["enabled"]:false) { @@ -535,12 +641,6 @@ UI::ChangeWidget(`id(`table), `Item(SrcID, 0) , _("X")); } - else - { - Report::Error(sformat(_("The source does not support the architecture of this machine (%1). -Select another source. -"), arch)); - } } else if (ret == `remove) { @@ -597,6 +697,18 @@ continue; } + if (ProductCreator::GetArch() != Arch::architecture()) + { + y2milestone("Target architecture has been changed"); + ProductCreator::Config["arch"] = ProductCreator::GetArch(); + + // TODO: check archs onece again (needed after switching architecture multiple times) + // reload repositories + Pkg::SourceFinishAll(); +// Pkg::TargetInit("/"); + Pkg::SourceStartManager(false); + } + going_back = false; break; @@ -851,8 +963,8 @@ // while the package manager is initialized UI::ReplaceWidget(`rep, mode == nil ? - `PackageSelector(`id(`packages )) : - `PackageSelector(`id(`packages ), `opt(mode)) + `PackageSelector(`id(`packages)) : + `PackageSelector(`id(`packages), `opt(mode)) ); symbol result = (symbol) UI::RunPkgSelection(`id(`packages ) ); @@ -1417,6 +1529,16 @@ summary = Summary::AddLine(summary, sformat(_("Selected %1 packages"), size(Pkg::GetPackages(`selected, true)))); + string arch = ProductCreator::Config["arch"]:""; + // display the architecture in the summary if it has been changed + if (arch != nil && arch != "" && arch != Arch::architecture()) + { + summary = Summary::AddHeader(summary, _("Architecture") ); + + // summary line, %1 is e.g. i386, x86_64, ppc... + summary = Summary::AddLine(summary, sformat(_("Target architectrure: %1"), arch)); + } + // summary caption summary = Summary::AddHeader(summary,_("Output Directory")); Modified: branches/tmp/lslezak/product-creator-cross-arch/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/product-creator-c… ============================================================================== --- branches/tmp/lslezak/product-creator-cross-arch/src/wizards.ycp (original) +++ branches/tmp/lslezak/product-creator-cross-arch/src/wizards.ycp Wed Aug 6 12:50:41 2008 @@ -303,7 +303,7 @@ list<string> required_packages = ["inst-source-utils", "mkisofs", "createrepo"]; // add PPC specific packages - if (Arch::architecture() == "ppc" || Arch::architecture() == "ppc64") + if (ProductCreator::GetArch() == "ppc" || ProductCreator::GetArch() == "ppc64") { // /bin/objcopy - binutils // /bin/mkzimage - lilo -- 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] r49754 - /trunk/storage/libstorage/src/AppUtil.cc
by aschnell＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: aschnell Date: Wed Aug 6 11:55:14 2008 New Revision: 49754 URL: http://svn.opensuse.org/viewcvs/yast?rev=49754&view=rev Log: - removed obsolete variable Modified: trunk/storage/libstorage/src/AppUtil.cc 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 Wed Aug 6 11:55:14 2008 @@ -631,7 +631,7 @@ return false; } -bool system_cmd_testmode = false; + const string app_ws = " \t\n"; } -- 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] r49753 - /tags/stable-2_17_2/ldap/
by jsuchome＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: jsuchome Date: Wed Aug 6 11:53:52 2008 New Revision: 49753 URL: http://svn.opensuse.org/viewcvs/yast?rev=49753&view=rev Log: Created tag stable-2_17_2 for ldap Added: tags/stable-2_17_2/ldap/ - copied from r49752, trunk/ldap/ -- 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] r49752 - in /trunk/ldap: VERSION package/yast2-ldap.changes src/LdapServerAccess.pm
by jsuchome＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: jsuchome Date: Wed Aug 6 11:53:48 2008 New Revision: 49752 URL: http://svn.opensuse.org/viewcvs/yast?rev=49752&view=rev Log: - adapted LdapServerAccess to new API of yast2-ldap-server (patch from rhafer) - 2.17.2 Modified: trunk/ldap/VERSION trunk/ldap/package/yast2-ldap.changes trunk/ldap/src/LdapServerAccess.pm Modified: trunk/ldap/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/VERSION?rev=49752&r1=49751&… ============================================================================== --- trunk/ldap/VERSION (original) +++ trunk/ldap/VERSION Wed Aug 6 11:53:48 2008 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: trunk/ldap/package/yast2-ldap.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/package/yast2-ldap.changes?… ============================================================================== --- trunk/ldap/package/yast2-ldap.changes (original) +++ trunk/ldap/package/yast2-ldap.changes Wed Aug 6 11:53:48 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 6 11:36:43 CEST 2008 - jsuchome(a)suse.cz + +- adapted LdapServerAccess to new API of yast2-ldap-server (rhafer) +- 2.17.2 + +------------------------------------------------------------------- Fri Jul 18 12:02:34 CEST 2008 - jsuchome(a)suse.cz - do not lowercase LDAP object names (fate#303596) Modified: trunk/ldap/src/LdapServerAccess.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/src/LdapServerAccess.pm?rev… ============================================================================== --- trunk/ldap/src/LdapServerAccess.pm (original) +++ trunk/ldap/src/LdapServerAccess.pm Wed Aug 6 11:53:48 2008 @@ -70,8 +70,14 @@ } require YaPI::LdapServer; + if ( ! YaPI::LdapServer->Init() ) + { + y2error ("Initialzing LDAP Server YaPI failed"); + return undef; + } + my $schema_added = 0; - my $schemas_ref = YaPI::LdapServer->ReadSchemaIncludeList (); + my $schemas_ref = YaPI::LdapServer->ReadSchemaList (); if (! defined ($schemas_ref) || ref ($schemas_ref) ne "ARRAY") { y2error ("Retrieving current LDAP schemas failed"); @@ -79,27 +85,23 @@ } my @schemas = @{$schemas_ref}; foreach my $schema (@new_schemas) { - my @current_schema = grep /$schema/, @schemas; + $schema =~ /^.*\/(.*)\.(schema|ldif)$/; + my $schema_base = $1; + y2milestone("Schemabase: $schema_base"); + my @current_schema = grep /$schema_base/, @schemas; if (0 == scalar (@current_schema)) { y2milestone ("Including schema $schema"); - push @schemas, $schema; - $schema_added = 1; + if (! YaPI::LdapServer->AddSchema( $schema) ) { + return undef; + } } else { y2milestone ("Schema $schema is already included"); } } - if ($schema_added) { - if (! YaPI::LdapServer->WriteSchemaIncludeList (\@schemas)) { - return undef; - } - if ($restart) { - YaPI::LdapServer->SwitchService (1); - } - } - return Boolean ($schema_added); + return Boolean(1); } # Add new index to ldap server database @@ -131,7 +133,7 @@ } my $attr = $new_index->{"attr"}; - my $param = $new_index->{"param"}; + my @param = split(/,/, $new_index->{"param"}); if (! $self->InstallLdapServer ()) { y2error ("Cannot install $package_name, not checking LDAP schemas"); @@ -139,32 +141,67 @@ } require YaPI::LdapServer; + if ( ! YaPI::LdapServer->Init() ) + { + y2error ("Initialzing LDAP Server YaPI failed"); + return undef; + } my $indices = YaPI::LdapServer->ReadIndex ($suffix); - if (defined $indices && ref ($indices) eq "ARRAY") { - - foreach my $index (@$indices) { - my $attrs = $index->{"attr"} || ""; - my $params = $index->{"param"} || ""; + my $index_mod = { "name" => $attr }; + if (defined $indices && ref ($indices) eq "HASH") { - my @current_attrs = grep /^$attr$/, split (/,/, $attrs); - my @current_params = grep /^$param$/, split (/,/, $param); - - if (scalar (@current_attrs) >0 && scalar (@current_params) > 0) { + if ( defined $indices->{$attr} ) + { + + if ( ( grep /^eq$/, @param ) || ( $indices->{$attr}->{'eq'} ) ) + { + $index_mod->{'eq'} = 1; + } + if ( ( grep /^sub$/, @param ) || ( $indices->{$attr}->{'sub'} ) ) + { + $index_mod->{'pres'} = 1; + } + if ( ( grep /^pres$/, @param ) || ( $indices->{$attr}->{'pres'} ) ) + { + $index_mod->{'pres'} = 1; + } + if ( ( $index_mod->{'pres'} == $indices->{$attr}->{'pres'} ) && + ( $index_mod->{'sub'} == $indices->{$attr}->{'sub'} ) && + ( $index_mod->{'eq'} == $indices->{$attr}->{'eq'} ) ) + { y2milestone ("index for $attr already present"); - $present = 1; - } - } + $present = 1; + } + } + else + { + if ( grep /^eq$/, @param ) + { + $index_mod->{'eq'} = 1; + } + if ( grep /^sub$/, @param ) + { + $index_mod->{'pres'} = 1; + } + if ( grep /^pres$/, @param ) + { + $index_mod->{'pres'} = 1; + } + $present = 0; + } + if (! $present) { y2milestone ("$attr index missing, adding"); - if (!YaPI::LdapServer->AddIndex ($suffix, $new_index)) { + if (!YaPI::LdapServer->EditIndex ($suffix, $index_mod)) { return undef; } if ($restart) { - YaPI::LdapServer->SwitchService(1); + # No restart needed anymore + # YaPI::LdapServer->SwitchService(1); } } - return Boolean (!$present); + return Boolean(1); } return undef; } -- 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] r49751 - /trunk/ldap/src/LdapServerAccess.pm
by jsuchome＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: jsuchome Date: Wed Aug 6 11:38:29 2008 New Revision: 49751 URL: http://svn.opensuse.org/viewcvs/yast?rev=49751&view=rev Log: propdel Modified: trunk/ldap/src/LdapServerAccess.pm (props changed) -- 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] r49750 - /trunk/yast2/library/network/src/SuSEFirewallServices.ycp
by locilka＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: locilka Date: Wed Aug 6 10:52:18 2008 New Revision: 49750 URL: http://svn.opensuse.org/viewcvs/yast?rev=49750&view=rev Log: Docu Modified: trunk/yast2/library/network/src/SuSEFirewallServices.ycp Modified: trunk/yast2/library/network/src/SuSEFirewallServices.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewallServices.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewallServices.ycp Wed Aug 6 10:52:18 2008 @@ -25,6 +25,7 @@ // MORE INFORMATION IN FEATURE #300687: Ports for SuSEfirewall added via packages. // ANOTHER REFERENCE: Bugzilla #246911. // + // See also http://en.opensuse.org/SuSEfirewall2/Service_Definitions_Added_via_Packages // /*** -- 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] r49749 - in /trunk/yast2: library/network/src/SuSEFirewall.ycp library/network/src/SuSEFirewallServices.ycp package/yast2.changes
by locilka＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: locilka Date: Wed Aug 6 10:36:31 2008 New Revision: 49749 URL: http://svn.opensuse.org/viewcvs/yast?rev=49749&view=rev Log: - Converting old built-in allowed services configuration in firewall to services defined by packages (bnc #399217). Modified: trunk/yast2/library/network/src/SuSEFirewall.ycp trunk/yast2/library/network/src/SuSEFirewallServices.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/network/src/SuSEFirewall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewall.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewall.ycp Wed Aug 6 10:36:31 2008 @@ -25,6 +25,8 @@ import "Progress"; import "PortRanges"; import "PackageSystem"; + import "FileUtils"; + import "Directory"; //  @@ -2213,6 +2215,15 @@ ReadSysconfigSuSEFirewall ( GetListOfSuSEFirewallVariables() ); } + // old internal services definitions are converted to new services defined by packages + // but only once + string converted_to_services_dbp_file = Directory::vardir + "/yast2-firewall-already-converted-to-sdbp"; + + // services have been already converted + boolean already_converted = false; + + global void ConvertToServicesDefinedByPackages(); + /** * Function for reading SuSEFirewall configuration. * Fills internal variables only. @@ -2322,6 +2333,10 @@ if (have_progress) Progress::NextStage(); + // bnc #399217 + // Converting built-in service definitions to services defined by packages + ConvertToServicesDefinedByPackages(); + if (have_progress) Progress::Finish(); return true; @@ -2481,6 +2496,13 @@ if (have_progress) Progress::NextStage(); + if (already_converted && ! FileUtils::Exists (converted_to_services_dbp_file)) { + y2milestone ("Writing %1: %2", + converted_to_services_dbp_file, + SCR::Write (.target.string, converted_to_services_dbp_file, "") + ); + } + if (have_progress) Progress::Finish(); return true; @@ -2570,7 +2592,7 @@ // only when the service is allowed in zone - remove all its needed ports if (IsServiceSupportedInZone(service_id, zone) == true) { - // all needed ports etc for service/protocol, well, I'm not good at function pointers :-< + // all needed ports etc for service/protocol list <string> needed_all = []; if (protocol == "TCP") { needed_all = SuSEFirewallServices::GetNeededTCPPorts(service_id); @@ -3259,6 +3281,124 @@ } } + /** + * Removes old-service definitions before they are added as services defined + * by packages. + */ + void RemoveOldAllowedServiceFromZone (map <string, any> old_service_def, string zone) { + y2milestone ("Removing: %1 from zone %2", old_service_def, zone); + + if (old_service_def["tcp_ports"]:[] != []) { + foreach (string one_service, old_service_def["tcp_ports"]:[], { + RemoveService (one_service, "TCP", zone); + }); + } + + if (old_service_def["udp_ports"]:[] != []) { + foreach (string one_service, old_service_def["udp_ports"]:[], { + RemoveService (one_service, "UDP", zone); + }); + } + + if (old_service_def["rpc_ports"]:[] != []) { + foreach (string one_service, old_service_def["rpc_ports"]:[], { + RemoveService (one_service, "RPC", zone); + }); + } + + if (old_service_def["ip_protocols"]:[] != []) { + foreach (string one_service, old_service_def["ip_protocols"]:[], { + RemoveService (one_service, "IP", zone); + }); + } + + if (old_service_def["broadcast_ports"]:[] != []) { + map <string, list <string> > broadcast = GetBroadcastAllowedPorts(); + + broadcast[zone] = filter (string one_port, broadcast[zone]:[], { + return (! contains (old_service_def["broadcast_ports"]:[], one_port)); + }); + + SetBroadcastAllowedPorts (broadcast); + } + } + + /** + * Converts old built-in service definitions to services defined by packages. + * + * @see #bnc 399217 + */ + global void ConvertToServicesDefinedByPackages () { + if (already_converted) { + return; + } + + if (FileUtils::Exists (converted_to_services_dbp_file)) { + y2milestone ("Configuration has been already converted"); + already_converted = true; + return; + } + + // $[ zone : $[ protocol : [ list of ports ] ] ] + map <string, map <string, list <string> > > current_conf = $[]; + + foreach (string zone, GetKnownFirewallZones (), { + current_conf[zone] = $[]; + + foreach (string protocol, supported_protocols, { + current_conf[zone, protocol] = GetAllowedServicesForZoneProto (zone, protocol); + current_conf[zone, "broadcast"] = splitstring (GetBroadcastConfiguration (zone), " \n"); + }); + }); + + y2milestone ("Current conf: %1", current_conf); + + foreach (string zone, GetKnownFirewallZones (), { + foreach (string old_service_id, map <string, any> old_service_def, SuSEFirewallServices::OLD_SERVICES, { + y2milestone ("Checking %1 in %2 zone", old_service_id, zone); + + if (old_service_def["tcp_ports"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["tcp_ports"]:[], "TCP", zone, true) != true) + return; + + if (old_service_def["udp_ports"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["udp_ports"]:[], "UDP", zone, true) != true) + return; + + if (old_service_def["rpc_ports"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["rpc_ports"]:[], "RPC", zone, false) != true) + return; + + if (old_service_def["ip_protocols"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["ip_protocols"]:[], "IP", zone, false) != true) + return; + + if (old_service_def["broadcast_ports"]:[] != [] && IsBroadcastAllowed (old_service_def["broadcast_ports"]:[], zone) != true) + return; + + if (old_service_def["convert_to"]:[] == []) { + y2milestone ("Service %1 supported, but it doesn't have any replacement", old_service_id); + return; + } + + boolean replaced = false; + + foreach (string replacement, old_service_def["convert_to"]:[], { + if (SuSEFirewallServices::IsKnownService (replacement)) { + y2milestone ("Old service %1 matches %2", old_service_id, replacement); + RemoveOldAllowedServiceFromZone (old_service_def, zone); + SetServicesForZones ([replacement], [zone], true); + replaced = true; + break; + } + }); + + if (! replaced) { + y2warning ("Old service %1 matches %2 but none are installed", old_service_id, old_service_def["convert_to"]:[]); + } + }); + }); + + y2milestone ("Converting done"); + already_converted = true; + } + //  /* EOF */ Modified: trunk/yast2/library/network/src/SuSEFirewallServices.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewallServices.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewallServices.ycp Wed Aug 6 10:36:31 2008 @@ -77,14 +77,14 @@ /** * Services definitions for conversion to the new ones. */ - define map <string, map<string, any> > OLD_SERVICES = $[ + global define map <string, map<string, any> > OLD_SERVICES = $[ "http" : $[ "tcp_ports" : [ "http" ], - "convert_to" : [ "apache2", "lighttpd" ], + "convert_to" : [ "service:apache2", "service:lighttpd" ], ], "https" : $[ "tcp_ports" : [ "https" ], - "convert_to" : [ "apache2-ssl", "lighttpd-ssl" ], + "convert_to" : [ "service:apache2-ssl", "service:lighttpd-ssl" ], ], "smtp" : $[ "tcp_ports" : [ "smtp" ], @@ -100,11 +100,11 @@ ], "imap" : $[ "tcp_ports" : [ "imap" ], - "convert_to" : [ "courier-imapd" ], + "convert_to" : [ "service:courier-imapd" ], ], "imaps" : $[ "tcp_ports" : [ "imaps" ], - "convert_to" : [ "courier-imap-ssl" ], + "convert_to" : [ "service:courier-imap-ssl" ], ], "samba-server" : $[ "tcp_ports" : [ "netbios-ssn", "microsoft-ds" ], // TCP: 139, 445 @@ -114,7 +114,7 @@ ], "ssh" : $[ "tcp_ports" : [ "ssh" ], - "convert_to" : [ "sshd" ], + "convert_to" : [ "service:sshd" ], ], "rsync" : $[ "tcp_ports" : [ "rsync" ], @@ -123,7 +123,7 @@ "dhcp-server" : $[ "udp_ports" : [ "bootps" ], "broadcast_ports" : [ "bootps" ], - "convert_to" : [ "dhcp-server" ], + "convert_to" : [ "service:dhcp-server" ], ], "dhcp-client" : $[ "udp_ports" : [ "bootpc" ], @@ -132,11 +132,11 @@ "dns-server" : $[ "tcp_ports" : [ "domain" ], "udp_ports" : [ "domain" ], - "convert_to" : [ "bind" ], + "convert_to" : [ "service:bind" ], ], "nfs-client" : $[ "rpc_ports" : [ "portmap", "status", "nlockmgr" ], - "convert_to" : [ "nfs-client" ], + "convert_to" : [ "service:nfs-client" ], ], "nfs-server" : $[ "rpc_ports" : [ "portmap", "status", "nlockmgr", "mountd", "nfs", "nfs_acl" ], @@ -144,7 +144,7 @@ ], "nis-client" : $[ "rpc_ports" : [ "portmap", "ypbind" ], - "convert_to" : [ "ypserv" ], + "convert_to" : [ "service:ypserv" ], ], "nis-server" : $[ "rpc_ports" : [ "portmap", "ypserv", "fypxfrd", "ypbind", "yppasswdd" ], @@ -174,11 +174,11 @@ "ntp-server" : $[ "udp_ports" : [ "ntp" ], "broadcast_ports" : [ "ntp" ], - "convert_to" : [ "ntp" ], + "convert_to" : [ "service:ntp" ], ], "ldap" : $[ "tcp_ports" : [ "ldap" ], - "convert_to" : [ "openldap" ], + "convert_to" : [ "service:openldap" ], ], "ldaps" : $[ "tcp_ports" : [ "ldaps" ], @@ -216,11 +216,11 @@ ], "mysql-server" : $[ "tcp_ports" : [ "mysql" ], - "convert_to" : [ "mysql" ], + "convert_to" : [ "service:mysql" ], ], "iscsi-server" : $[ "tcp_ports" : [ "iscsi-target" ], - "convert_to" : [ "iscsitarget" ], + "convert_to" : [ "service:iscsitarget" ], ], ]; 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 Wed Aug 6 10:36:31 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 6 10:34:07 CEST 2008 - locilka(a)suse.cz + +- Converting old built-in allowed services configuration in + firewall to services defined by packages (bnc #399217). + +------------------------------------------------------------------- Wed Jul 30 11:53:35 CEST 2008 - lslezak(a)suse.cz - PackageLock::Connect() - display more details about owner of the -- 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] r49748 - in /branches/tmp/lslezak/product-creator-cross-arch: ./ MAINTAINER Makefile.cvs RPMNAME VERSION agents/ configure.in.in doc/ package/ scripts/ src/ testsuite/ yast2-product-creator.spec.in
by lslezak＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: lslezak Date: Wed Aug 6 10:35:38 2008 New Revision: 49748 URL: http://svn.opensuse.org/viewcvs/yast?rev=49748&view=rev Log: - branch for cross-architecture support (branched from TRUNK rev. 49747) Added: branches/tmp/lslezak/product-creator-cross-arch/ branches/tmp/lslezak/product-creator-cross-arch/MAINTAINER (props changed) - copied unchanged from r49747, trunk/product-creator/MAINTAINER branches/tmp/lslezak/product-creator-cross-arch/Makefile.cvs (props changed) - copied unchanged from r49747, trunk/product-creator/Makefile.cvs branches/tmp/lslezak/product-creator-cross-arch/RPMNAME (props changed) - copied unchanged from r49747, trunk/product-creator/RPMNAME branches/tmp/lslezak/product-creator-cross-arch/VERSION (props changed) - copied unchanged from r49747, trunk/product-creator/VERSION branches/tmp/lslezak/product-creator-cross-arch/agents/ (props changed) - copied from r49747, trunk/product-creator/agents/ branches/tmp/lslezak/product-creator-cross-arch/configure.in.in (props changed) - copied unchanged from r49747, trunk/product-creator/configure.in.in branches/tmp/lslezak/product-creator-cross-arch/doc/ (props changed) - copied from r49747, trunk/product-creator/doc/ branches/tmp/lslezak/product-creator-cross-arch/package/ (props changed) - copied from r49747, trunk/product-creator/package/ branches/tmp/lslezak/product-creator-cross-arch/scripts/ (props changed) - copied from r49747, trunk/product-creator/scripts/ branches/tmp/lslezak/product-creator-cross-arch/src/ (props changed) - copied from r49747, trunk/product-creator/src/ branches/tmp/lslezak/product-creator-cross-arch/testsuite/ (props changed) - copied from r49747, trunk/product-creator/testsuite/ branches/tmp/lslezak/product-creator-cross-arch/yast2-product-creator.spec.in (props changed) - copied unchanged from r49747, trunk/product-creator/yast2-product-creator.spec.in -- 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] r49747 - in /trunk/ncurses-pkg/src: Makefile.am NCPackageSelector.cc NCPackageSelector.h NCPkgFilterInstSummary.cc NCPkgFilterInstSummary.h
by kmachalkova＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: kmachalkova Date: Wed Aug 6 10:28:48 2008 New Revision: 49747 URL: http://svn.opensuse.org/viewcvs/yast?rev=49747&view=rev Log: Filtering packages by status (#384085) Added: trunk/ncurses-pkg/src/NCPkgFilterInstSummary.cc trunk/ncurses-pkg/src/NCPkgFilterInstSummary.h Modified: trunk/ncurses-pkg/src/Makefile.am trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h Modified: trunk/ncurses-pkg/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/Makefile.am?rev=… ============================================================================== --- trunk/ncurses-pkg/src/Makefile.am (original) +++ trunk/ncurses-pkg/src/Makefile.am Wed Aug 6 10:28:48 2008 @@ -39,6 +39,7 @@ NCPkgFilterPattern.h \ NCPkgFilterLocale.h \ NCPkgFilterRPMGroups.h \ + NCPkgFilterInstSummary.h \ NCPkgStrings.h \ NCZypp.h @@ -68,6 +69,7 @@ NCPkgFilterPattern.cc \ NCPkgFilterLocale.cc \ NCPkgFilterRPMGroups.cc \ + NCPkgFilterInstSummary.cc \ NCPkgStrings.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Wed Aug 6 10:28:48 2008 @@ -878,10 +878,11 @@ } case Summary: { - placeholder = new NCEmpty( replPoint ); - placeholder->setSize( oldSize.Sze.W, oldSize.Sze.H ); - placeholder->Redraw(); + inst_summary = new NCPkgFilterInstSummary( replPoint, _("&Packages with Status"), this ); + inst_summary->setSize( oldSize.Sze.W, oldSize.Sze.H ); + inst_summary->Redraw(); pkgList->fillSummaryList(NCPkgTable::L_Changes); + break; } default: yuiError() << "zatim nic" << endl; Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Wed Aug 6 10:28:48 2008 @@ -39,6 +39,7 @@ #include "NCPkgFilterRPMGroups.h" #include "NCPkgFilterSearch.h" +#include "NCPkgFilterInstSummary.h" #include "NCPkgTable.h" #include "NCEmpty.h" #include "NCPkgMenuFilter.h" @@ -57,6 +58,7 @@ class NCPkgDiskspace; class NCPkgFilterRPMGroups; class NCPkgFilterSearch; +class NCPkgFilterInstSummary; class NCPkgPopupFile; class NCPkgMenuExtras; class NCPkgMenuDeps; @@ -111,6 +113,7 @@ NCPkgDiskspace * diskspacePopup; // the popup showing the disk usage NCPkgFilterSearch * searchPopup; // the package search popup + NCPkgFilterInstSummary *inst_summary; bool youMode; // YOU bool updateMode; // Update @@ -146,7 +149,6 @@ YReplacePoint * replacePoint; // replace point for info text YReplacePoint * replPoint; YReplacePoint * replPoint2; //tohle pak urcite prejmenuj, Bublino - NCEmpty *placeholder; NCPkgTable * versionsList; // list of available package versions // information about patches Added: trunk/ncurses-pkg/src/NCPkgFilterInstSummary.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterInstS… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterInstSummary.cc (added) +++ trunk/ncurses-pkg/src/NCPkgFilterInstSummary.cc Wed Aug 6 10:28:48 2008 @@ -0,0 +1,158 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgFilterInstSummary.cc + + Author: Hedgehog Painter <kmachalkova(a)suse.cz> + +/-*/ + +#include "NCPkgFilterInstSummary.h" + +/* + Textdomain "ncurses-pkg" +*/ + +NCPkgFilterInstSummary::NCPkgFilterInstSummary ( YWidget *parent, string label, NCPackageSelector *pkger) + : NCMultiSelectionBox ( parent, label) + , pkg( pkger ) +{ + //setNotify(true); + createLayout(); +} + +NCPkgFilterInstSummary::~NCPkgFilterInstSummary() +{ + +} + +void NCPkgFilterInstSummary::createLayout() +{ + del = new YItem ( _( "Delete" ), true); + items.push_back (del); + inst = new YItem ( _( "Install" ), true); + items.push_back (inst); + update = new YItem ( _( "Update" ), true); + items.push_back (update); + taboo = new YItem ( _( "Taboo" ), true); + items.push_back (taboo); + protect = new YItem ( _( "Protected" ), true); + items.push_back (protect); + keep = new YItem ( _( "Keep" )); + items.push_back (keep); + dontinstall = new YItem ( _( "Do not install" )); + items.push_back (dontinstall); + + addItems( items ); +} + +bool NCPkgFilterInstSummary::check( ZyppObj opkg, ZyppSel slb ) +{ + if (!slb) + return false; + + bool show = false; + + switch ( slb->status() ) + { + //group these two together, due to lack of space + case S_Del: + case S_AutoDel: show = del->selected(); break; + case S_Install: + case S_AutoInstall: show = inst->selected(); break; + case S_KeepInstalled: show = keep->selected(); break; + case S_NoInst: show = dontinstall->selected(); break; + case S_Protected: show = protect->selected(); break; + case S_Taboo: show = taboo->selected(); break; + case S_Update: + case S_AutoUpdate: show = update->selected(); break; + } + + if ( show ) + { + ZyppPkg pkg = tryCastToZyppPkg (opkg); + + if ( !pkg ) + return false; + } + + return show; +} + +bool NCPkgFilterInstSummary::showInstSummaryPackages() +{ + + NCPkgTable * packageList = pkg->PackageList(); + + if ( !packageList ) + { + yuiError() << "No valid NCPkgTable widget" << endl; + return false; + } + + // clear the package table + packageList->itemsCleared (); + + + for_( listIt, zyppPkgBegin(), zyppPkgEnd() ) + { + ZyppSel selectable = *listIt; + ZyppObj obj = selectable->candidateObj(); + + if (!obj) + { + // If there is neither an installed nor a candidate package, check + // any other instance. + ( selectable->installedObj() ) ? (obj = selectable->installedObj()) + : ( obj = selectable->theObj() ); + } + + if( check( obj, selectable ) ) + { + ZyppPkg pkg = tryCastToZyppPkg (obj); + packageList->createListEntry( pkg, selectable); + } + + } + + // show the package list + packageList->setCurrentItem( 0 ); + packageList->drawList(); + packageList->showInformation(); + + yuiMilestone() << "Fill package list" << endl; + + return true; + +} + +NCursesEvent NCPkgFilterInstSummary::wHandleInput( wint_t ch ) +{ + NCursesEvent ret = NCursesEvent::none; + + //treat this like any other MultiSelBox input ... + NCMultiSelectionBox::wHandleInput( ch ) ; + switch ( ch ) + { + //special case for toggling item status + case KEY_SPACE: + case KEY_RETURN: { + showInstSummaryPackages(); + } + } + + //... but do not return to the main loop + ret = NCursesEvent::handled; + + return ret; +} + Added: trunk/ncurses-pkg/src/NCPkgFilterInstSummary.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterInstS… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterInstSummary.h (added) +++ trunk/ncurses-pkg/src/NCPkgFilterInstSummary.h Wed Aug 6 10:28:48 2008 @@ -0,0 +1,60 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgFilterMain.h + + Author: Hedgehog Painter <kmachalkova(a)suse.cz> + +/-*/ + +#ifndef NCPkgFilterInstSummary_h +#define NCPkgFilterInstSummary_h + +#include <string> + +#include "NCurses.h" +#include "NCi18n.h" +#include "NCPackageSelector.h" +#include "NCPkgTable.h" +#include "NCMultiSelectionBox.h" +#include "NCZypp.h" + +class NCPkgFilterInstSummary : public NCMultiSelectionBox { + + NCPkgFilterInstSummary & operator=( const NCPkgFilterInstSummary & ); + NCPkgFilterInstSummary ( const NCPkgFilterInstSummary & ); + + bool check (ZyppObj opkg, ZyppSel slb); + NCPackageSelector *pkg; + +public: + + YItemCollection items; + YItem *del; + YItem *inst; + YItem *update; + YItem *taboo; + YItem *protect; + YItem *keep; + YItem *dontinstall; + + + NCPkgFilterInstSummary (YWidget *parent, string label, NCPackageSelector *pkg); + virtual ~NCPkgFilterInstSummary(); + + void createLayout(); + bool showInstSummaryPackages(); + NCursesEvent wHandleInput( wint_t ch ); + +}; + +#endif -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49746 - /tags/stable-2_17_16/network/
by mzugec＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: mzugec Date: Wed Aug 6 09:21:09 2008 New Revision: 49746 URL: http://svn.opensuse.org/viewcvs/yast?rev=49746&view=rev Log: Created tag stable-2_17_16 for network Added: tags/stable-2_17_16/network/ - copied from r49745, trunk/network/ -- 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] r49745 - /tags/stable-2_17_16/
by mzugec＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: mzugec Date: Wed Aug 6 09:21:08 2008 New Revision: 49745 URL: http://svn.opensuse.org/viewcvs/yast?rev=49745&view=rev Log: Created tag stable-2_17_16 Added: tags/stable-2_17_16/ -- 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] r49744 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp src/lan/bridge.ycp
by mzugec＠svn.opensuse.org 06 Aug '08

06 Aug '08

Author: mzugec Date: Wed Aug 6 09:21:03 2008 New Revision: 49744 URL: http://svn.opensuse.org/viewcvs/yast?rev=49744&view=rev Log: - installation via wireless (bnc#223570) - possibility to add bond device into bridge and device with /32 prefixlen (bnc#405343) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp trunk/network/src/lan/bridge.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=49744&r1=497… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Aug 6 09:21:03 2008 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Aug 6 09:21:03 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Aug 6 09:18:00 CEST 2008 - mzugec(a)suse.cz + +- installation via wireless (bnc#223570) +- possibility to add bond device into bridge and device with /32 + prefixlen (bnc#405343) +- 2.17.16 + +------------------------------------------------------------------- Tue Aug 5 10:28:41 CEST 2008 - mzugec(a)suse.cz - improved help text (bnc#376063) Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Wed Aug 6 09:21:03 2008 @@ -100,11 +100,11 @@ ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2"); ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); - ReadInstallInfItem(install_inf, "WlanESSID", "WESSID"); - ReadInstallInfItem(install_inf, "WlanAuth", "WAuth"); - ReadInstallInfItem(install_inf, "WlanKey", "WKey"); - ReadInstallInfItem(install_inf, "WlanKeyType", "WkeyType"); - ReadInstallInfItem(install_inf, "WlanKeyLen", "WkeyLen"); + ReadInstallInfItem(install_inf, "WESSID", "WlanESSID"); + ReadInstallInfItem(install_inf, "WAuth", "WlanAuth"); + ReadInstallInfItem(install_inf, "WKey", "WlanKey"); + ReadInstallInfItem(install_inf, "WkeyType", "WlanKeyType"); + ReadInstallInfItem(install_inf, "WkeyLen", "WlanKeyLen"); /* Split network device */ @@ -210,27 +210,43 @@ SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); } - // wlan devices - if (size(InstallInf["WESSID"]:"")>0 || size(InstallInf["WAuth"]:"")>0 || - size(InstallInf["WKey"]:"")>0 || size(InstallInf["WKeyType"]:"")>0 || - size(InstallInf["WKeyLen"]:"")>0) + // wireless devices (bnc#223570) + if ( size(InstallInf["WESSID"]:"")>0 ) { network_configuration = sformat("%1WIRELESS_ESSID='%2'\n", network_configuration, InstallInf["WESSID"]:""); - network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); - network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); - network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:""); - if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) - network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, +// network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); + switch(InstallInf["WAuth"]:""){ + case "" : // "" means wpa-psk + case "psk" : + network_configuration = sformat("%1WIRELESS_WPA_PSK='%2'\n", network_configuration, InstallInf["WKey"]:""); + network_configuration = sformat("%1WIRELESS_AUTH_MODE='psk'\n", network_configuration); + break; + case "open" : + network_configuration = sformat("%1WIRELESS_AUTH_MODE='no-encryption'\n", network_configuration); + break; + case "wep_open" : + case "wep_restricted" : + string type=""; + if (InstallInf["WkeyType"]:""=="password") type="h:"; + else if (InstallInf["WkeyType"]:""=="ascii") type="s:"; + network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, (InstallInf["WAuth"]:""=="wep-open") ? "open" : "sharedkey"); + network_configuration = sformat("%1WIRELESS_DEFAULT_KEY='0'\n", network_configuration); + network_configuration = sformat("%1WIRELESS_KEY_0='%2%3'\n", network_configuration, type, InstallInf["WKey"]:""); + network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:""); + if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) + network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:""); + break; + } } // if available, write MTU - if (size(InstallInf["mtu"]:"")>0) + if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); // for queth devices (s390) - if (size(InstallInf["LLADDR"]:"")>0) + if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); Modified: trunk/network/src/lan/bridge.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/bridge.ycp?rev=4… ============================================================================== --- trunk/network/src/lan/bridge.ycp (original) +++ trunk/network/src/lan/bridge.ycp Wed Aug 6 09:21:03 2008 @@ -56,7 +56,10 @@ string device = t[0, 0]:""; if (contains(sel, device) && hasAnyValue(device)) { if (contains(confs, device)){ - if (contains(["tun", "tap"], NetworkInterfaces::GetType(device))) continue; + // allow to add bonding device into bridge and also device with mask /32(bnc#405343) + if (contains(["tun", "tap", "bond"], NetworkInterfaces::GetType(device))) continue; + if (((string)configurations[NetworkInterfaces::GetType(device), device, "PREFIXLEN"]:"" != "32") + || ((string)configurations[NetworkInterfaces::GetType(device), device, "NETMASK"]:"" != "255.255.255.255")) if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0") { if(!confirmed) { valid = Popup::ContinueCancel(_("At least one selected device is already configured. -- 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] r49743 - /trunk/storage/libstorage/src/Volume.cc
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Wed Aug 6 01:42:48 2008 New Revision: 49743 URL: http://svn.opensuse.org/viewcvs/yast?rev=49743&view=rev Log: - shell quoting Modified: trunk/storage/libstorage/src/Volume.cc 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 Wed Aug 6 01:42:48 2008 @@ -1201,7 +1201,7 @@ switch( fs ) { case SWAP: - cmd = "mkswap " + mountDevice(); + cmd = "mkswap " + quote(mountDevice()); c.execute( cmd ); if( c.retcode()!=0 ) ret = VOLUME_RESIZE_FAILED; @@ -1213,7 +1213,7 @@ cmd = "echo y | " + cmd; cmd += "-s " + decString(size_k) + "K "; } - cmd += mountDevice(); + cmd += quote(mountDevice()); c.execute( cmd ); if( c.retcode()!=0 ) { @@ -1225,7 +1225,7 @@ cmd = "echo y | ntfsresize -f "; if( needShrink() ) cmd += "-s " + decString(size_k) + "k "; - cmd += mountDevice(); + cmd += quote(mountDevice()); c.setCombine(); c.execute( cmd ); if( c.retcode()!=0 ) @@ -1237,7 +1237,7 @@ break; case EXT2: case EXT3: - cmd = "resize2fs -f " + mountDevice(); + cmd = "resize2fs -f " + quote(mountDevice()); if( needShrink() ) cmd += " " + decString(size_k) + "K"; c.execute( cmd ); @@ -2018,24 +2018,24 @@ { case EXT2: case EXT3: - cmd = "/sbin/tune2fs -L \"" + label + "\" " + mountDevice(); + cmd = "/sbin/tune2fs -L " + quote(label) + " " + quote(mountDevice()); break; case REISERFS: - cmd = "/sbin/reiserfstune -l \"" + label + "\" " + mountDevice(); + cmd = "/sbin/reiserfstune -l " + quote(label) + " " + quote(mountDevice()); break; case JFS: - cmd = "/sbin/jfs_tune -L \"" + label + "\" " + mountDevice(); + cmd = "/sbin/jfs_tune -L " + quote(label) + " " + quote(mountDevice()); break; case XFS: { string tlabel = label; if( label.empty() ) tlabel = "--"; - cmd = "/usr/sbin/xfs_admin -L " + tlabel + " " + mountDevice(); + cmd = "/usr/sbin/xfs_admin -L " + tlabel + " " + quote(mountDevice()); } break; case SWAP: - cmd = "/sbin/mkswap -L \"" + label + "\" " + mountDevice(); + cmd = "/sbin/mkswap -L " + quote(label) + "\" " + quote(mountDevice()); break; default: ret = VOLUME_MKLABEL_FS_UNABLE; -- 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] r49742 - in /trunk/storage/libstorage/src: StorageDefines.h Volume.cc
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Wed Aug 6 01:33:05 2008 New Revision: 49742 URL: http://svn.opensuse.org/viewcvs/yast?rev=49742&view=rev Log: - shell quoting Modified: trunk/storage/libstorage/src/StorageDefines.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDe… ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Wed Aug 6 01:33:05 2008 @@ -27,5 +27,10 @@ #define KPARTXBIN "/sbin/kpartx" #define DMRAIDBIN "/sbin/dmraid" +#define MOUNTBIN "/bin/mount" +#define UMOUNTBIN "/bin/umount" +#define SWAPONBIN "/sbin/swapon" +#define SWAPOFFBIN "/sbin/swapoff" + #endif 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 Wed Aug 6 01:33:05 2008 @@ -787,7 +787,7 @@ { cmd += params + " "; } - cmd += mountDevice(); + cmd += quote(mountDevice()); SystemCmd c; c.setOutputProcessor( p ); c.execute( cmd ); @@ -817,7 +817,7 @@ cmd += "journal_data_writeback "; else cmd += "journal_data "; - cmd += mountDevice(); + cmd += quote(mountDevice()); SystemCmd c( cmd ); if( c.retcode()!=0 ) ret = VOLUME_TUNE2FS_FAILED; @@ -931,21 +931,21 @@ d = dmcrypt_dev; else if( loop_active ) d = loop_dev; - string cmdline = ((detected_fs != SWAP)?"umount ":"swapoff ") + d; + string cmdline = ((detected_fs != SWAP)?UMOUNTBIN " ":SWAPOFFBIN " ") + quote(d); int ret = cmd.execute( cmdline ); if( ret != 0 && mountDevice()!=dev ) { - cmdline = ((detected_fs != SWAP)?"umount ":"swapoff ") + dev; + cmdline = ((detected_fs != SWAP)?UMOUNTBIN " ":SWAPOFFBIN " ") + quote(dev); ret = cmd.execute( cmdline ); } if( ret!=0 && !mp.empty() && mp!="swap" ) { - cmdline = "umount " + mp; + cmdline = UMOUNTBIN " " + quote(mp); ret = cmd.execute( cmdline ); } if( ret!=0 && !orig_mp.empty() && orig_mp!="swap" ) { - cmdline = "umount " + orig_mp; + cmdline = UMOUNTBIN " " + quote(orig_mp); ret = cmd.execute( cmdline ); } if( ret != 0 ) @@ -1701,10 +1701,10 @@ if( ok ) { c.execute( "modprobe " + fs_names[detected_fs] ); - c.execute( "mount -oro -t " + fsTypeString(detected_fs) + " " + - use_dev + " " + mpname ); + c.execute(MOUNTBIN " -oro -t " + fsTypeString(detected_fs) + " " + + quote(use_dev) + " " + quote(mpname)); ok = c.retcode()==0; - c.execute( "umount " + mpname ); + c.execute(UMOUNTBIN " " + quote(mpname)); } if( !ok ) { @@ -2120,7 +2120,7 @@ cmdline = "modprobe nls_iso8859-1"; cmd.execute( cmdline ); } - cmdline = "mount "; + cmdline = MOUNTBIN " "; if( ro ) cmdline += "-r "; const char * ign_opt[] = { "defaults", "" }; @@ -2145,11 +2145,11 @@ opts += mergeString( l, "," ); opts += " "; } - cmdline += "-t " + fsn + opts + mountDevice() + " " + lmount; + cmdline += "-t " + fsn + opts + quote(mountDevice()) + " " + quote(lmount); } else { - cmdline = "swapon " + mountDevice(); + cmdline = SWAPONBIN " " + quote(mountDevice()); if( cont->getStorage()->instsys() ) { ProcMounts mountData( cont->getStorage() ); @@ -2527,7 +2527,7 @@ } else { - c.execute( (string)"mount -oremount " + mp ); + c.execute(MOUNTBIN " -oremount " + quote(mp)); y2mil( "remount remount:" << c.retcode() ); if( c.retcode()!=0 ) ret = VOLUME_REMOUNT_FAILED; -- 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] r49741 - /trunk/storage/libstorage/src/LvmVg.cc
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 22:31:40 2008 New Revision: 49741 URL: http://svn.opensuse.org/viewcvs/yast?rev=49741&view=rev Log: - fixed shell quoting for vgcreate Modified: trunk/storage/libstorage/src/LvmVg.cc 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 Aug 5 22:31:40 2008 @@ -997,7 +997,7 @@ { if( !devices.empty() ) devices += " "; - devices += p->device; + devices += quote(p->device); ret = doCreatePv( p->device ); ++p; } @@ -1010,7 +1010,7 @@ rmdir( ddir.c_str() ); } string cmd = VGCREATEBIN " " + instSysString() + metaString() + - "-s " + decString(pe_size) + "k " + quote(name()) + " " + quote(devices); + "-s " + decString(pe_size) + "k " + quote(name()) + " " + devices; SystemCmd c( cmd ); if( c.retcode()!=0 ) { -- 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] r49740 - in /trunk/storage/libstorage/src: DmraidCo.cc StorageDefines.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 22:11:22 2008 New Revision: 49740 URL: http://svn.opensuse.org/viewcvs/yast?rev=49740&view=rev Log: - shell quoting Modified: trunk/storage/libstorage/src/DmraidCo.cc trunk/storage/libstorage/src/StorageDefines.h 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 Aug 5 22:11:22 2008 @@ -10,6 +10,7 @@ #include "y2storage/SystemCmd.h" #include "y2storage/AppUtil.h" #include "y2storage/Storage.h" +#include "y2storage/StorageDefines.h" using namespace std; using namespace storage; @@ -30,7 +31,7 @@ void DmraidCo::getRaidData( const string& name ) { y2milestone( "name:%s", name.c_str() ); - SystemCmd c( "dmraid -s -c -c -c " + quote(name)); + SystemCmd c(DMRAIDBIN " -s -c -c -c " + quote(name)); list<string>::const_iterator ci; list<string> sl; if( c.numLines()>0 ) @@ -110,11 +111,11 @@ if( val ) { Dm::activate(true); - c.execute( "dmraid -ay -p " ); + c.execute(DMRAIDBIN " -ay -p"); } else { - c.execute( "dmraid -an " ); + c.execute(DMRAIDBIN " -an"); } active = val; } @@ -123,7 +124,7 @@ void DmraidCo::getRaids( list<string>& l ) { l.clear(); - SystemCmd c( "dmraid -s -c -c -c" ); + SystemCmd c(DMRAIDBIN " -s -c -c -c"); for( unsigned i=0; i<c.numLines(); ++i ) { list<string> sl = splitString( *c.getLine(i), ":" ); @@ -195,11 +196,11 @@ { getStorage()->showInfoCb( removeText(true) ); } - string cmd = "cd /var/log/YaST2 && echo y | dmraid -E -r"; + string cmd = "cd /var/log/YaST2 && echo y | " DMRAIDBIN " -E -r"; SystemCmd c; for( list<Pv>::const_iterator i=pv.begin(); i!=pv.end(); ++i ) { - c.execute( cmd + " " + i->device ); + c.execute(cmd + " " + quote(i->device)); } if( c.retcode()!=0 ) { Modified: trunk/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageDe… ============================================================================== --- trunk/storage/libstorage/src/StorageDefines.h (original) +++ trunk/storage/libstorage/src/StorageDefines.h Tue Aug 5 22:11:22 2008 @@ -25,6 +25,7 @@ #define MULTIPATHBIN "/sbin/multipath" #define DMSETUPBIN "/sbin/dmsetup" #define KPARTXBIN "/sbin/kpartx" +#define DMRAIDBIN "/sbin/dmraid" #endif -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49739 - /tags/stable-2_17_11/storage/
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 21:13:24 2008 New Revision: 49739 URL: http://svn.opensuse.org/viewcvs/yast?rev=49739&view=rev Log: Created tag stable-2_17_11 for storage Added: tags/stable-2_17_11/storage/ - copied from r49738, trunk/storage/ -- 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] r49738 - in /trunk/storage/libstorage/src: AppUtil.h AsciiFile.h DmPart.h DmPartCo.h ListListIterator.h StorageInterface.h SystemCmd.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 20:56:49 2008 New Revision: 49738 URL: http://svn.opensuse.org/viewcvs/yast?rev=49738&view=rev Log: - some consistency Modified: trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/AsciiFile.h trunk/storage/libstorage/src/DmPart.h trunk/storage/libstorage/src/DmPartCo.h trunk/storage/libstorage/src/ListListIterator.h trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/SystemCmd.h Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Tue Aug 5 20:56:49 2008 @@ -1,8 +1,5 @@ -// -*- C++ -*- -// Maintainer: fehr(a)suse.de - -#ifndef _AppUtil_h -#define _AppUtil_h +#ifndef APP_UTIL_H +#define APP_UTIL_H #include <time.h> #include <libintl.h> Modified: trunk/storage/libstorage/src/AsciiFile.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile… ============================================================================== --- trunk/storage/libstorage/src/AsciiFile.h (original) +++ trunk/storage/libstorage/src/AsciiFile.h Tue Aug 5 20:56:49 2008 @@ -1,8 +1,5 @@ -// -*- C++ -*- -// Maintainer: fehr(a)suse.de - -#ifndef _AsciiFile_h -#define _AsciiFile_h +#ifndef ASCII_FILE_H +#define ASCII_FILE_H #include <vector> #include <list> 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 Aug 5 20:56:49 2008 @@ -1,5 +1,5 @@ -#ifndef DMPART_H -#define DMPART_H +#ifndef DM_PART_H +#define DM_PART_H #include "y2storage/Dm.h" #include "y2storage/Partition.h" 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 Aug 5 20:56:49 2008 @@ -1,5 +1,5 @@ -#ifndef DMPART_CO_H -#define DMPART_CO_H +#ifndef DM_PART_CO_H +#define DM_PART_CO_H #include <list> 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 Aug 5 20:56:49 2008 @@ -1,5 +1,5 @@ -#ifndef LISTLIST_ITERATOR_H -#define LISTLIST_ITERATOR_H +#ifndef LIST_LIST_ITERATOR_H +#define LIST_LIST_ITERATOR_H #include "y2storage/AppUtil.h" #include "y2storage/IterPair.h" 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 Aug 5 20:56:49 2008 @@ -1,5 +1,5 @@ -#ifndef STORAGEINTERFACE_H -#define STORAGEINTERFACE_H +#ifndef STORAGE_INTERFACE_H +#define STORAGE_INTERFACE_H #include <string> Modified: trunk/storage/libstorage/src/SystemCmd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.h (original) +++ trunk/storage/libstorage/src/SystemCmd.h Tue Aug 5 20:56:49 2008 @@ -1,8 +1,5 @@ -// -*- C++ -*- -// Maintainer: fehr(a)suse.de - -#ifndef _SystemCmd_h -#define _SystemCmd_h +#ifndef SYSTEM_CMD_H +#define SYSTEM_CMD_H #include <sys/poll.h> #include <stdio.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] r49737 - /trunk/storage/libstorage/src/LvmVg.cc
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 20:48:04 2008 New Revision: 49737 URL: http://svn.opensuse.org/viewcvs/yast?rev=49737&view=rev Log: - shell quoting Modified: trunk/storage/libstorage/src/LvmVg.cc 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 Aug 5 20:48:04 2008 @@ -1049,7 +1049,7 @@ getStorage()->showInfoCb( removeVgText(true) ); } checkConsistency(); - string cmd = VGREMOVEBIN " " + name(); + string cmd = VGREMOVEBIN " " + quote(name()); SystemCmd c( cmd ); if( c.retcode()!=0 ) { -- 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] r49736 - in /trunk/storage/libstorage/src: SystemCmd.cc SystemCmd.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 19:39:19 2008 New Revision: 49736 URL: http://svn.opensuse.org/viewcvs/yast?rev=49736&view=rev Log: - removed funny non-counting counter Modified: trunk/storage/libstorage/src/SystemCmd.cc trunk/storage/libstorage/src/SystemCmd.h 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 Aug 5 19:39:19 2008 @@ -21,30 +21,29 @@ using namespace std; using namespace storage; -int SystemCmd::Nr_i = 0; //#define FULL_DEBUG_SYSTEM_CMD + SystemCmd::SystemCmd( const char* Command ) - { - y2milestone( "Konstruktor SystemCmd:\"%s\" Nr:%d", Command, Nr_i ); +{ + y2mil("constructor SystemCmd:\"" << Command << "\""); init(); execute( Command ); - } +} SystemCmd::SystemCmd( const string& Command_Cv ) - { - y2milestone( "Konstruktor SystemCmd:\"%s\" Nr:%d", Command_Cv.c_str(), - Nr_i ); +{ + y2mil("constructor SystemCmd:\"" << Command_Cv << "\""); init(); execute( Command_Cv ); - } +} SystemCmd::SystemCmd() - { +{ + y2mil("constructor SystemCmd"); init(); - y2milestone( "Konstruktor SystemCmd Nr:%d", Nr_i ); - } +} void SystemCmd::init() { @@ -93,12 +92,12 @@ return( doExecute( Cmd_Cv )); } -int SystemCmd::executeRestricted( const string& Command_Cv, +int SystemCmd::executeRestricted( const string& Command_Cv, long unsigned MaxTimeSec, - long unsigned MaxLineOut, + long unsigned MaxLineOut, bool& ExceedTime, bool& ExceedLines ) { - y2milestone( "cmd:%s MaxTime:%lu MaxLines:%lu", Command_Cv.c_str(), + y2milestone( "cmd:%s MaxTime:%lu MaxLines:%lu", Command_Cv.c_str(), MaxTimeSec, MaxLineOut ); ExceedTime = ExceedLines = false; int ret = executeBackground( Command_Cv ); @@ -188,14 +187,14 @@ bool ok_bi = true; if( !testmode && pipe(sout)<0 ) { - y2error( "pipe stdout creation failed errno=%d (%s)", errno, - strerror(errno)); + y2error( "pipe stdout creation failed errno=%d (%s)", errno, + strerror(errno)); ok_bi = false; } - if( !testmode && !Combine_b && pipe(serr)<0 ) + if( !testmode && !Combine_b && pipe(serr)<0 ) { - y2error( "pipe stderr creation failed errno=%d (%s)", errno, - strerror(errno)); + y2error( "pipe stderr creation failed errno=%d (%s)", errno, + strerror(errno)); ok_bi = false; } if( !testmode && ok_bi ) @@ -203,16 +202,16 @@ pfds[0].fd = sout[0]; if( fcntl( pfds[0].fd, F_SETFL, O_NONBLOCK )<0 ) { - y2error( "fcntl O_NONBLOCK failed errno=%d (%s)", errno, - strerror(errno)); + y2error( "fcntl O_NONBLOCK failed errno=%d (%s)", errno, + strerror(errno)); } if( !Combine_b ) { pfds[1].fd = serr[0]; if( fcntl( pfds[1].fd, F_SETFL, O_NONBLOCK )<0 ) { - y2error( "fcntl O_NONBLOCK failed errno=%d (%s)", errno, - strerror(errno)); + y2error( "fcntl O_NONBLOCK failed errno=%d (%s)", errno, + strerror(errno)); } } y2debug( "sout:%d serr:%d", pfds[0].fd, Combine_b?-1:pfds[1].fd ); @@ -223,28 +222,28 @@ setenv( "LANGUAGE", "C", 1 ); if( dup2( sout[1], 1 )<0 ) { - y2error( "dup2 stdout child failed errno=%d (%s)", errno, + y2error( "dup2 stdout child failed errno=%d (%s)", errno, strerror(errno)); } if( !Combine_b && dup2( serr[1], 2 )<0 ) { - y2error( "dup2 stderr child failed errno=%d (%s)", errno, + y2error( "dup2 stderr child failed errno=%d (%s)", errno, strerror(errno)); } if( Combine_b && dup2( 1, 2 )<0 ) { - y2error( "dup2 stderr child failed errno=%d (%s)", errno, + y2error( "dup2 stderr child failed errno=%d (%s)", errno, strerror(errno)); } if( close( sout[0] )<0 ) { - y2error( "close child failed errno=%d (%s)", errno, - strerror(errno)); + y2error( "close child failed errno=%d (%s)", errno, + strerror(errno)); } if( !Combine_b && close( serr[0] )<0 ) { - y2error( "close child failed errno=%d (%s)", errno, - strerror(errno)); + y2error( "close child failed errno=%d (%s)", errno, + strerror(errno)); } closeOpenFds(); Ret_i = execl( Shell_Ci.c_str(), Shell_Ci.c_str(), "-c", @@ -258,28 +257,28 @@ default: if( close( sout[1] )<0 ) { - y2error( "close parent failed errno=%d (%s)", errno, - strerror(errno)); + y2error( "close parent failed errno=%d (%s)", errno, + strerror(errno)); } if( !Combine_b && close( serr[1] )<0 ) { - y2error( "close parent failed errno=%d (%s)", errno, - strerror(errno)); + y2error( "close parent failed errno=%d (%s)", errno, + strerror(errno)); } Ret_i = 0; File_aC[IDX_STDOUT] = fdopen( sout[0], "r" ); if( File_aC[IDX_STDOUT] == NULL ) { - y2error( "fdopen stdout failed errno=%d (%s)", errno, - strerror(errno)); + y2error( "fdopen stdout failed errno=%d (%s)", errno, + strerror(errno)); } if( !Combine_b ) { File_aC[IDX_STDERR] = fdopen( serr[0], "r" ); if( File_aC[IDX_STDERR] == NULL ) { - y2error( "fdopen stderr failed errno=%d (%s)", errno, - strerror(errno)); + y2error( "fdopen stderr failed errno=%d (%s)", errno, + strerror(errno)); } } if( !Background_b ) @@ -320,12 +319,12 @@ do { - y2debug( "[0] id:%d ev:%x [1] fs:%d ev:%x", + y2debug( "[0] id:%d ev:%x [1] fs:%d ev:%x", pfds[0].fd, (unsigned)pfds[0].events, Combine_b?-1:pfds[1].fd, Combine_b?0:(unsigned)pfds[1].events ); if( (sel=poll( pfds, Combine_b?1:2, 1000 ))<0 ) { - y2error( "poll failed errno=%d (%s)", errno, strerror(errno)); + y2error( "poll failed errno=%d (%s)", errno, strerror(errno)); } y2debug( "poll ret:%d", sel ); if( sel>0 ) @@ -479,7 +478,7 @@ Size_ii++; } } - y2milestone( "Pid:%d Idx:%d Pattern:\"%s\" Invert:%d Lines %d", Pid_i, + y2milestone( "Pid:%d Idx:%d Pattern:\"%s\" Invert:%d Lines %d", Pid_i, Idx_iv, Pat_Cv.c_str(), Invert_bv, Size_ii ); return( Size_ii ); } @@ -678,7 +677,7 @@ string SystemCmd::quote(const string& str) -{ +{ return "'" + boost::replace_all_copy(str, "'", "'\\''") + "'"; } Modified: trunk/storage/libstorage/src/SystemCmd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.h (original) +++ trunk/storage/libstorage/src/SystemCmd.h Tue Aug 5 19:39:19 2008 @@ -28,9 +28,9 @@ virtual ~SystemCmd(); int execute( const string& Command_Cv ); int executeBackground( const string& Command_Cv ); - int executeRestricted( const string& Command_Cv, + int executeRestricted( const string& Command_Cv, unsigned long MaxTimeSec, - unsigned long MaxLineOut, + unsigned long MaxLineOut, bool& ExceedTime, bool& ExceedLines); void setOutputHandler( void (*Handle_f)( void *, string, bool ), void * Par_p ); @@ -102,7 +102,7 @@ void *HandlerPar_p; OutputProcessor* output_proc; struct pollfd pfds[2]; - static int Nr_i; + }; -- 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] r49735 - in /trunk/storage/libstorage/src: AppUtil.h Storage.cc SystemCmd.cc SystemCmd.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 18:18:43 2008 New Revision: 49735 URL: http://svn.opensuse.org/viewcvs/yast?rev=49735&view=rev Log: - moved variable system_cmd_testmode to SystemCmd Modified: trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/SystemCmd.cc trunk/storage/libstorage/src/SystemCmd.h Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Tue Aug 5 18:18:43 2008 @@ -96,7 +96,6 @@ return dngettext("storage", msgid, msgid_plural, n); } -extern bool system_cmd_testmode; extern const string app_ws; } 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 Aug 5 18:18:43 2008 @@ -245,7 +245,7 @@ if( testmode ) { - system_cmd_testmode = true; + SystemCmd::testmode = true; rootprefix = testdir; fstab = new EtcFstab( rootprefix ); string t = testdir+"/volume_info"; 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 Aug 5 18:18:43 2008 @@ -186,19 +186,19 @@ int sout[2]; int serr[2]; bool ok_bi = true; - if( !system_cmd_testmode && pipe(sout)<0 ) + if( !testmode && pipe(sout)<0 ) { y2error( "pipe stdout creation failed errno=%d (%s)", errno, strerror(errno)); ok_bi = false; } - if( !system_cmd_testmode && !Combine_b && pipe(serr)<0 ) + if( !testmode && !Combine_b && pipe(serr)<0 ) { y2error( "pipe stderr creation failed errno=%d (%s)", errno, strerror(errno)); ok_bi = false; } - if( ok_bi && !system_cmd_testmode ) + if( !testmode && ok_bi ) { pfds[0].fd = sout[0]; if( fcntl( pfds[0].fd, F_SETFL, O_NONBLOCK )<0 ) @@ -289,7 +289,7 @@ break; } } - else if( !system_cmd_testmode ) + else if( !testmode ) { Ret_i = -1; } @@ -302,7 +302,7 @@ { y2error("system (%s) = %d", Cmd.c_str(), Ret_i); } - if( !system_cmd_testmode ) + if( !testmode ) checkOutput(); y2milestone( "system() Returns:%d", Ret_i ); if( Ret_i!=0 ) @@ -694,3 +694,7 @@ } return ret; } + + +bool SystemCmd::testmode = false; + Modified: trunk/storage/libstorage/src/SystemCmd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.h (original) +++ trunk/storage/libstorage/src/SystemCmd.h Tue Aug 5 18:18:43 2008 @@ -68,6 +68,8 @@ */ static string quote(const std::list<string>& strs); + static bool testmode; + protected: int placeOutput( unsigned Which_iv, std::vector<string> &Ret_Cr, const bool Append_bv ) const; -- 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] r49734 - /trunk/auditd/src/Auditd.ycp
by gs＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: gs Date: Tue Aug 5 18:16:24 2008 New Revision: 49734 URL: http://svn.opensuse.org/viewcvs/yast?rev=49734&view=rev Log: check for auditd and apparmor Modified: trunk/auditd/src/Auditd.ycp Modified: trunk/auditd/src/Auditd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/Auditd.ycp?rev=49734&… ============================================================================== --- trunk/auditd/src/Auditd.ycp (original) +++ trunk/auditd/src/Auditd.ycp Tue Aug 5 18:16:24 2008 @@ -299,23 +299,27 @@ string caption = _("Initializing auditd Configuration"); // Set the right number of stages - integer steps = 2; + integer steps = 3; integer sl = 500; sleep(sl); // We do not set help text here, because it was set outside Progress::New( caption, " ", steps, [ - /* Progress stage 1/3 */ + /* Progress stage 1/4 */ _("Read the configuration for auditd"), - /* Progress stage 2/3 */ - _("Read the rules file") - /* Progress stage 3/3 */ + /* Progress stage 2/4 */ + _("Read the rules file"), + /* Progress stage 3/4 */ + _("Check status of auditd") + /* Progress stage 3/4 */ ], [ /* Progress step 1/3 */ _("Reading the configuration..."), /* Progress step 2/3 */ _("Reading the rules file..."), + /* Progress step 3/3 */ + _("Cecking status..." ), Message::Finished() ], "" @@ -348,6 +352,13 @@ if(false) Report::Error(Message::CannotReadCurrentSettings()); sleep(sl); + Progress::NextStage(); + integer exitcode = Service::Status( "auditd" ); + y2milestone( "Auditd running: %1", (exitcode == 0 )?"yes":"no" ); + + exitcode = (integer)SCR::Execute(.target.bash, "rcapparmor status" ); + y2milestone( "Apparmor loaded: %1", (exitcode == 0 )?"yes":"no" ); + if(PollAbort()) return false; modified = false; return true; -- 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] r49733 - in /trunk/auditd/src: Auditd.ycp dialogs.ycp
by gs＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: gs Date: Tue Aug 5 17:55:28 2008 New Revision: 49733 URL: http://svn.opensuse.org/viewcvs/yast?rev=49733&view=rev Log: restart auditd and call auditctl -R in Write() Modified: trunk/auditd/src/Auditd.ycp trunk/auditd/src/dialogs.ycp Modified: trunk/auditd/src/Auditd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/Auditd.ycp?rev=49733&… ============================================================================== --- trunk/auditd/src/Auditd.ycp (original) +++ trunk/auditd/src/Auditd.ycp Tue Aug 5 17:55:28 2008 @@ -41,6 +41,7 @@ import "Popup"; import "Mode"; import "FileUtils"; +import "Service"; /** @@ -418,14 +419,19 @@ if(!success) Report::Error (_("Cannot write settings to auditd.conf.") ); sleep(sl); - // run SuSEconfig + // restart auditd + integer exitCode = Service::RunInitScript( "auditd", "restart" ); + if(PollAbort()) return false; Progress::NextStage (); success = WriteAuditdRules(); /* Error message */ if(!success) Report::Error (_("Cannot write settings to auditd.rules.") ); sleep(sl); - + + // call auditctl -R audit.rules + success = (boolean)SCR::Execute( .target.bash, "auditctl -R /etc/audit/audit.rules" ); + if(PollAbort()) return false; return true; } Modified: trunk/auditd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/dialogs.ycp?rev=49733… ============================================================================== --- trunk/auditd/src/dialogs.ycp (original) +++ trunk/auditd/src/dialogs.ycp Tue Aug 5 17:55:28 2008 @@ -195,7 +195,7 @@ ) ) ) , `VWeight( 80, `VBox( - `Left(`Label(_("Current rules for audit daemon:") ) ), + `Left(`Label(_("Edit rules for audit daemon here:") ) ), `MultiLineEdit(`id("rules"), Auditd::GetRulesFile() ) ) ), -- 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] r49732 - in /trunk/storage: libstorage/src/Container.cc libstorage/src/StorageInterface.h libstorage/src/StorageTypes.h storage/src/modules/Storage.ycp storage/src/modules/StorageFields.ycp
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 17:53:22 2008 New Revision: 49732 URL: http://svn.opensuse.org/viewcvs/yast?rev=49732&view=rev Log: - more evms removal Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/StorageInterface.h trunk/storage/libstorage/src/StorageTypes.h trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp 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 Aug 5 17:53:22 2008 @@ -417,5 +417,5 @@ } const string Container::type_names[] = { "UNKNOWN", "DISK", "MD", "LOOP", "LVM", - "DM", "EVMS", "DMRAID", "NFS" }; + "DM", "DMRAID", "NFS" }; 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 Aug 5 17:53:22 2008 @@ -114,7 +114,7 @@ enum UsedByType { UB_NONE, UB_LVM, UB_MD, UB_DM, UB_DMRAID }; - enum CType { CUNKNOWN, DISK, MD, LOOP, LVM, DM, EVMS, DMRAID, NFSC, + enum CType { CUNKNOWN, DISK, MD, LOOP, LVM, DM, DMRAID, NFSC, COTYPE_LAST_ENTRY }; /** 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 Aug 5 17:53:22 2008 @@ -19,7 +19,6 @@ 7, // LOOP 5, // LVM 4, // DM - 6, // EVMS 2, // DMRAID 8 // NFSC }; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 17:53:22 2008 @@ -72,7 +72,6 @@ LibStorage::MD() : `CT_MD, LibStorage::LOOP() : `CT_LOOP, LibStorage::LVM() : `CT_LVM, - LibStorage::EVMS() : `CT_EVMS, LibStorage::DMRAID() : `CT_DMRAID, LibStorage::DM() : `CT_DM, LibStorage::NFSC() : `CT_NFS Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Tue Aug 5 17:53:22 2008 @@ -26,7 +26,7 @@ global void IterateTargetMap(map<string, map> target_map, void(map<string, map>, map) callback) { const map disk_order = $[ `CT_DMRAID : 0, `CT_DISK : 1, `CT_MD : 2, `CT_LOOP : 3, - `CT_LVM : 4, `CT_EVMS : 5, `CT_DM : 6, `CT_NFS : 7 ]; + `CT_LVM : 4, `CT_DM : 6, `CT_NFS : 7 ]; list<string> keys = maplist(string dev, map disk, target_map, { return dev; }); keys = sort(string a, string b, keys, { -- 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] r49731 - in /trunk/auditd/src: Auditd.ycp complex.ycp dialogs.ycp wizards.ycp
by gs＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: gs Date: Tue Aug 5 17:41:24 2008 New Revision: 49731 URL: http://svn.opensuse.org/viewcvs/yast?rev=49731&view=rev Log: add possibility to configure enable/disable to rules dialog Modified: trunk/auditd/src/Auditd.ycp trunk/auditd/src/complex.ycp trunk/auditd/src/dialogs.ycp trunk/auditd/src/wizards.ycp Modified: trunk/auditd/src/Auditd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/Auditd.ycp?rev=49731&… ============================================================================== --- trunk/auditd/src/Auditd.ycp (original) +++ trunk/auditd/src/Auditd.ycp Tue Aug 5 17:41:24 2008 @@ -84,6 +84,11 @@ return config_file; } +global list <string> GetWatches() { + return ( [ "exit,always watch=/etc/passwd perm=rwx", + "entry,always watch=/etc/sysconfig/yast2 perm=rwx"] ); +} + /** * Data was modified? * @return true if modified Modified: trunk/auditd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/complex.ycp?rev=49731… ============================================================================== --- trunk/auditd/src/complex.ycp (original) +++ trunk/auditd/src/complex.ycp Tue Aug 5 17:41:24 2008 @@ -187,19 +187,67 @@ void InitRulesDialog( string id ) { - list<string> rules_list = []; - string rules = Auditd::GetRules(); + UI::ChangeWidget( `id( "rules"), `Value, Auditd::GetRules() ); + + y2milestone ( "Init rules dialog" ); +} - if ( rules != nil && rules != "") +symbol HandleRulesDialog(string id, map event) { + any action = event["ID"]:nil; + + if ( action == "audit_enabled" ) { - rules_list = splitstring( rules, "\n"); + string value = (string)UI::QueryWidget( `id("audit_enabled"), `Value ); + string rule = ""; + string rules = Auditd::GetRules(); + list <string> rules_list = []; + + y2milestone( "Setting status to: %1", value ); + + switch ( value ) + { + case "lock": { + rule = "-e 2"; + break; + } + case "enable": { + rule = "-e 1"; + break; + } + case "disable": { + rule = "-e 0"; + break; + } + } + + if ( rules != nil && rules != "") + { + rules_list = splitstring( rules, "\n"); + } + + boolean rule_found = false; + + if ( rules_list != [] ) + { + list<string> new_rules = maplist( string line, rules_list, { + if ( regexpmatch( line, "^[ /t]*-e" ) ) + { + rule_found = true; + return rule; + } + else + { + return line; + } + }); + if ( !rule_found ) + new_rules = add( new_rules, rule ); + + UI::ChangeWidget(`id("rules"), `Value, mergestring( new_rules, "\n" ) ); + } } - y2milestone( "RULES read from %1: %2", Auditd::GetRulesFile(), rules_list ); - - UI::ChangeWidget( `id( "rules"), `Value, rules ); - - y2milestone ( "Init rules dialog" ); + return nil; } void StoreRulesDialog( string id, map event) { Modified: trunk/auditd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/dialogs.ycp?rev=49731… ============================================================================== --- trunk/auditd/src/dialogs.ycp (original) +++ trunk/auditd/src/dialogs.ycp Tue Aug 5 17:41:24 2008 @@ -184,12 +184,21 @@ return `MarginBox( mbox_x, mbox_y, `VBox( - `VSpacing(1.0), - `VBox( - `Left(`Label(_("Edit rules for audit daemon here"))), - `VSpacing(1.0), - `MultiLineEdit(`id("rules"), Auditd::GetRulesFile() ) - ), + `VWeight( 20, `Frame( _("" ), + `VBox( + `Left(`ComboBox( `id("audit_enabled"), `opt(`notify), _("Configure Enabled Flag"), + [`item(`id("enable"), _("Enable Auditing"), true ), // -e 1 + `item(`id("disable"), _("Disable Auditing") ) // -e 0 + ] + )), + `VStretch() + ) + ) ) , + `VWeight( 80, `VBox( + `Left(`Label(_("Current rules for audit daemon:") ) ), + `MultiLineEdit(`id("rules"), Auditd::GetRulesFile() ) + ) + ), `VStretch() ) ); Modified: trunk/auditd/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/wizards.ycp?rev=49731… ============================================================================== --- trunk/auditd/src/wizards.ycp (original) +++ trunk/auditd/src/wizards.ycp Tue Aug 5 17:41:24 2008 @@ -73,6 +73,7 @@ "widget" : `custom, "help" : HELPS["auditd_rules"]:"", "custom_widget" : RulesDialogContent(), + "handle" : HandleRulesDialog, "init" : InitRulesDialog, "store" : StoreRulesDialog, ], -- 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] r49730 - /trunk/libyui-bindings/swig/python/examples/replacepoint.py
by kkaempf＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kkaempf Date: Tue Aug 5 17:37:21 2008 New Revision: 49730 URL: http://svn.opensuse.org/viewcvs/yast?rev=49730&view=rev Log: example for replacepoints Added: trunk/libyui-bindings/swig/python/examples/replacepoint.py Added: trunk/libyui-bindings/swig/python/examples/replacepoint.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui-bindings/swig/python/exam… ============================================================================== --- trunk/libyui-bindings/swig/python/examples/replacepoint.py (added) +++ trunk/libyui-bindings/swig/python/examples/replacepoint.py Tue Aug 5 17:37:21 2008 @@ -0,0 +1,27 @@ +# coding=UTF-8 +# +# Replacepoint, allows you to replace part of the widget tree +# +# Example by Jan-Simon MÃ¶ller <dl9pf(a)gmx.de> +# + +import sys +sys.path.insert(0,'../../../build/bindings/python') +import yui + +factory = yui.YUI.widgetFactory() +dialog = factory.createMainDialog() +replacepoint = factory.createReplacePoint(dialog) +hbox = factory.createHBox(replacepoint) +b1 = factory.createPushButton(hbox, "1") +b2 = factory.createPushButton(hbox, "2") +b3 = factory.createPushButton(hbox, "3") +event = dialog.waitForEvent() # push button +replacepoint.deleteChildren() +vbox = factory.createVBox(replacepoint) +b1 = factory.createPushButton(vbox, "1") +b2 = factory.createPushButton(vbox, "2") +b3 = factory.createPushButton(vbox, "3") +dialog.recalcLayout() +replacepoint.showChild() +event = dialog.waitForEvent() # tada! -- 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] r49729 - in /trunk/storage/libstorage/src: Container.cc Disk.cc Dm.cc DmPart.cc DmPartCo.cc Loop.cc LvmLv.cc LvmVg.cc Md.cc Nfs.cc Partition.cc Storage.cc Volume.cc
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 17:31:49 2008 New Revision: 49729 URL: http://svn.opensuse.org/viewcvs/yast?rev=49729&view=rev Log: - improvments to logging Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/DmPart.cc trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/Loop.cc trunk/storage/libstorage/src/LvmLv.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/Md.cc trunk/storage/libstorage/src/Nfs.cc trunk/storage/libstorage/src/Partition.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Volume.cc 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 Aug 5 17:31:49 2008 @@ -314,9 +314,9 @@ void Container::logDifference( const Container& c ) const - { - y2milestone( "%s", getDiffString(c).c_str() ); - } +{ + y2mil(getDiffString(c)); +} string Container::getDiffString( const Container& c ) const @@ -379,7 +379,7 @@ if( !ret ) { if( verbose ) - y2milestone( "%s", getDiffString( *c ).c_str() ); + y2mil(getDiffString( *c )); } else { 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 Aug 5 17:31:49 2008 @@ -2683,7 +2683,7 @@ else log += " iSCSI-->"; } - y2milestone( "%s", log.c_str() ); + y2mil(log); ConstPartPair pp=partPair(); ConstPartIter i=pp.begin(); while( i!=pp.end() ) 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 Aug 5 17:31:49 2008 @@ -569,10 +569,10 @@ } void Dm::logDifference( const Dm& rhs ) const - { - string log = stringDifference( rhs ); - y2milestone( "%s", log.c_str() ); - } +{ + string log = stringDifference(rhs); + y2mil(log); +} string Dm::stringDifference( const Dm& rhs ) const { 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 Aug 5 17:31:49 2008 @@ -182,10 +182,10 @@ } void DmPart::logDifference( const DmPart& rhs ) const - { - string log = stringDifference( rhs ); - y2milestone( "%s", log.c_str() ); - } +{ + string log = stringDifference(rhs); + y2mil(log); +} DmPart& DmPart::operator= ( const DmPart& rhs ) { 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 Aug 5 17:31:49 2008 @@ -968,7 +968,7 @@ void DmPartCo::logDifference( const DmPartCo& d ) const { string log = getDiffString( d ); - y2milestone( "%s", log.c_str() ); + y2mil(log); ConstDmPartPair pp=dmpartPair(); ConstDmPartIter i=pp.begin(); while( i!=pp.end() ) 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 Aug 5 17:31:49 2008 @@ -417,7 +417,7 @@ else log += " delFile-->"; } - y2milestone( "%s", log.c_str() ); + y2mil(log); } Loop& Loop::operator= ( const Loop& rhs ) 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 Aug 5 17:31:49 2008 @@ -255,7 +255,7 @@ log += " Status:" + status + "-->" + rhs.status; if( allocation!=rhs.allocation ) log += " Alloc:" + allocation + "-->" + rhs.allocation; - y2milestone( "%s", log.c_str() ); + y2mil(log); } LvmLv& LvmLv::operator= ( const LvmLv& rhs ) 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 Aug 5 17:31:49 2008 @@ -1454,7 +1454,7 @@ } if( uuid!=p->uuid ) log += " UUID:" + uuid + "-->" + p->uuid; - y2milestone( "%s", log.c_str() ); + y2mil(log); ConstLvmLvPair pp=lvmLvPair(); ConstLvmLvIter i=pp.begin(); while( i!=pp.end() ) 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 Aug 5 17:31:49 2008 @@ -650,7 +650,7 @@ b << " Spares:" << spare << "-->" << rhs.spare; log += b.str(); } - y2milestone( "%s", log.c_str() ); + y2mil(log); } Md& Md::operator= ( const Md& rhs ) 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 Aug 5 17:31:49 2008 @@ -93,10 +93,10 @@ } void Nfs::logDifference( const Nfs& rhs ) const - { - string log = Volume::logDifference( rhs ); - y2milestone( "%s", log.c_str() ); - } +{ + string log = Volume::logDifference(rhs); + y2mil(log); +} Nfs& Nfs::operator= ( const Nfs& rhs ) { 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 Aug 5 17:31:49 2008 @@ -642,7 +642,7 @@ else log += " boot-->"; } - y2milestone( "%s", log.c_str() ); + y2mil(log); } bool Partition::equalContent( const Partition& rhs ) const 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 Aug 5 17:31:49 2008 @@ -211,19 +211,15 @@ } void Storage::dumpObjectList() - { +{ ostringstream buf; - printInfo( buf ); + printInfo(buf); std::list<string> l = splitString( buf.str(), "\n" ); - y2milestone( "DETECTED OBJECTS" ); - std::list<string>::const_iterator i = l.begin(); - while( i!=l.end() ) - { - y2milestone( "%s", i->c_str() ); - ++i; - } - y2milestone( "END DETECTED OBJECTS" ); - } + y2mil("DETECTED OBJECTS"); + for (std::list<string>::const_iterator i = l.begin(); i != l.end(); i++) + y2mil(*i); + y2mil("END DETECTED OBJECTS"); +} void Storage::detectObjects() { @@ -3514,7 +3510,7 @@ b << "V:" << (*i)->vol()->device(); } b << "> "; - y2milestone( "%s", b.str().c_str() ); + y2mil(b.str()); b.str(""); todo.sort( cont_less<commitAction>() ); y2milestone( "stage %d", stage ); @@ -3526,7 +3522,7 @@ b << (*i)->name(); } b << "> "; - y2milestone( "%s", b.str().c_str() ); + y2mil(b.str()); b.str(""); b << "sorted vol <"; for( list<Volume*>::const_iterator i=vl.begin(); i!=vl.end(); ++i ) @@ -3536,7 +3532,7 @@ b << (*i)->device(); } b << "> "; - y2milestone( "%s", b.str().c_str() ); + y2mil(b.str()); b.str(""); b << "sorted actions <"; for( list<commitAction*>::const_iterator i=todo.begin(); i!=todo.end(); ++i ) @@ -3549,7 +3545,7 @@ b << "V:" << (*i)->vol()->device(); } b << "> "; - y2milestone( "%s", b.str().c_str() ); + y2mil(b.str()); } void Storage::handleHald( bool stop ) 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 Aug 5 17:31:49 2008 @@ -261,7 +261,7 @@ loop_dev = fstab_loop_dev = entry.loop_dev; b << " loop_dev:" << loop_dev << " encr:" << enc_names[encryption]; } - y2milestone( "%s", b.str().c_str() ); + y2mil(b.str()); } } @@ -330,7 +330,7 @@ list<string> l = splitString( *loopData.getLine( 0, true )); std::ostringstream b; b << "line[" << device() << "]=" << l; - y2milestone( "%s", b.str().c_str() ); + y2mil(b.str()); if( !l.empty() ) { list<string>::const_iterator el = l.begin(); @@ -360,7 +360,7 @@ } } b << " encr:" << encryption; - y2milestone( "%s", b.str().c_str() ); + y2mil(b.str()); } } } @@ -383,7 +383,7 @@ true, true, "\"" ); std::ostringstream b; b << "line[" << device() << "]=" << l; - y2milestone( "%s", b.str().c_str() ); + y2mil(b.str()); if( !l.empty() ) { l.pop_front(); @@ -467,7 +467,7 @@ } alt_names.push_back( "/dev/disk/by-label/" + label ); } - y2milestone( "%s", b.str().c_str() ); + y2mil(b.str()); } } } -- 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] r49728 - in /trunk/storage/libstorage/src: Container.cc Container.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 17:19:01 2008 New Revision: 49728 URL: http://svn.opensuse.org/viewcvs/yast?rev=49728&view=rev Log: - removed unused variable - added const to Container::type_names Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Container.h 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 Aug 5 17:19:01 2008 @@ -416,6 +416,6 @@ *this = rhs; } -string Container::type_names[] = { "UNKNOWN", "DISK", "MD", "LOOP", "LVM", - "DM", "EVMS", "DMRAID", "NFS" }; +const string Container::type_names[] = { "UNKNOWN", "DISK", "MD", "LOOP", "LVM", + "DM", "EVMS", "DMRAID", "NFS" }; 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 Aug 5 17:19:01 2008 @@ -48,14 +48,13 @@ virtual void logDifference( const Container& c ) const; virtual void getCommitActions( std::list<storage::commitAction*>& l ) const; - virtual int getToCommit( storage::CommitStage stage, + virtual int getToCommit( storage::CommitStage stage, std::list<Container*>& col, std::list<Volume*>& vol ); virtual int commitChanges( storage::CommitStage stage ); virtual int commitChanges( storage::CommitStage stage, Volume* vol ); - virtual void changeDeviceName( const string& old, const string& nw ) - {}; + virtual void changeDeviceName( const string& old, const string& nw ) {} unsigned numVolumes() const; bool isEmpty() const; void getInfo( storage::ContainerInfo& info ) const; @@ -142,7 +141,7 @@ void setDeleted( bool val=true ) { del=val; } void setCreated( bool val=true ) { create=val; } void setSilent( bool val=true ) { silent=val; } - void setUsedBy( storage::UsedByType t, const string& name ) { uby.set( t, name );} + void setUsedBy( storage::UsedByType t, const string& name ) { uby.set( t, name ); } const storage::usedBy& getUsedBy() const { return( uby ); } storage::UsedByType getUsedByType() const { return( uby.type() ); } const string& usedByName() const { return( uby.name() ); } @@ -177,15 +176,14 @@ virtual int doCreate( Volume * v ); virtual int doRemove( Volume * v ); virtual int doResize( Volume * v ); - virtual void logData( const string& Dir ) {;} + virtual void logData( const string& Dir ) {} Container& operator=( const Container& ); static bool stageDecrease( const Volume& v ) { return( v.deleted()||v.needShrink()); } static bool stageCreate( const Volume& v ) { return( v.created()||v.needExtend()); } - static string type_names[COTYPE_LAST_ENTRY]; - static unsigned order[COTYPE_LAST_ENTRY]; + static const string type_names[COTYPE_LAST_ENTRY]; Storage * const sto; storage::CType typ; -- 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] r49727 - /trunk/storage/libstorage/src/StorageTypes.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 16:52:57 2008 New Revision: 49727 URL: http://svn.opensuse.org/viewcvs/yast?rev=49727&view=rev Log: - added comments - cleanup Modified: trunk/storage/libstorage/src/StorageTypes.h 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 Aug 5 16:52:57 2008 @@ -2,7 +2,6 @@ #define STORAGE_TYPES_H #include <iostream> -#include <ext/stdio_filebuf.h> #include "y2storage/Regex.h" #include "y2storage/AppUtil.h" @@ -11,13 +10,24 @@ namespace storage { -inline bool operator<( CType a, CType b ) - { - static int order[COTYPE_LAST_ENTRY] = { 0, 1, 3, 7, 5, 4, 6, 2, 8 }; +inline bool operator<(CType a, CType b) +{ + static const int order[COTYPE_LAST_ENTRY] = { + 0, // CUNKNOWN + 1, // DISK + 3, // MD + 7, // LOOP + 5, // LVM + 4, // DM + 6, // EVMS + 2, // DMRAID + 8 // NFSC + }; + bool ret = order[a] < order[b]; - y2mil( "a:" << a << " o(a):" << order[a] << " b:" << b << " o(b):" << order[b] << " ret:" << ret ); - return( ret ); - } + y2mil("a:" << a << " o(a):" << order[a] << " b:" << b << " o(b):" << order[b] << " ret:" << ret); + return ret; +} inline bool operator<=( CType a, CType b ) { @@ -53,13 +63,13 @@ struct commitAction { - commitAction( CommitStage s, CType t, const string& d, const Volume* v, - bool destr=false ) - { stage=s; type=t; descr=d; destructive=destr; container=false; + commitAction( CommitStage s, CType t, const string& d, const Volume* v, + bool destr=false ) + { stage=s; type=t; descr=d; destructive=destr; container=false; u.vol=v; } - commitAction( CommitStage s, CType t, const string& d, const Container* co, - bool destr=false ) - { stage=s; type=t; descr=d; destructive=destr; container=true; + commitAction( CommitStage s, CType t, const string& d, const Container* co, + bool destr=false ) + { stage=s; type=t; descr=d; destructive=destr; container=true; u.co=co; } commitAction( CommitStage s, CType t, Volume* v ) { stage=s; type=t; destructive=false; container=false; u.vol=v; } @@ -70,7 +80,7 @@ string descr; bool destructive; bool container; - union + union { const Volume* vol; const Container* co; @@ -93,7 +103,7 @@ usedBy() : t(storage::UB_NONE) {;} usedBy( storage::UsedByType typ, const string& n ) : t(typ), nm(n) {;} void clear() { t=storage::UB_NONE; nm.erase(); } - void set( storage::UsedByType type, const string& n ) + void set( storage::UsedByType type, const string& n ) { t=type; (t==storage::UB_NONE)?nm.erase():nm=n; } bool operator==( const usedBy& rhs ) const { return( t==rhs.t && nm==rhs.nm ); } @@ -119,7 +129,7 @@ case storage::UB_LVM: st = "lvm"; break; - case storage::UB_MD: + case storage::UB_MD: st = "md"; break; case storage::UB_DM: -- 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] r49726 - in /trunk/ldap-server: src/YaPI/LdapServer.pm testsuite/full-test.pl
by rhafer＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: rhafer Date: Tue Aug 5 16:24:08 2008 New Revision: 49726 URL: http://svn.opensuse.org/viewcvs/yast?rev=49726&view=rev Log: First round of updates to adapt LdapServer YaPI to new agent Modified: trunk/ldap-server/src/YaPI/LdapServer.pm trunk/ldap-server/testsuite/full-test.pl Modified: trunk/ldap-server/src/YaPI/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/YaPI/LdapServer.… ============================================================================== --- trunk/ldap-server/src/YaPI/LdapServer.pm (original) +++ trunk/ldap-server/src/YaPI/LdapServer.pm Tue Aug 5 16:24:08 2008 @@ -12,11 +12,11 @@ \@dbList = ReadDatabaseList() - Returns a List of databases (suffix). + Returns a list of configured databases. $bool = AddDatabase(\%valueMap) - Creates a new database section in the configuration file + Creates a new database $bool = EditDatabase($suffix,\%valueMap) @@ -30,29 +30,17 @@ Returns a List of Maps with all index statements for this database -$bool = AddIndex($suffix,\%indexMap) +$bool = EditIndex($suffix,\%indexMap) Add a new index statement %indexMap to the database section -$bool = EditIndex($suffix,$index_md5,\%indexMap) +\@list = ReadSchemaList() - Replace the index $index_md5 in the database section + Returns a list of all included schema items -$bool = DeleteIndex($suffix,$index_md5) +$bool = AddSchema($schemaFile) - Delete the index $index_md5 statement in the database section - -$bool = RecreateIndex($suffix) - - Regenerate indices - -\@list = ReadSchemaIncludeList() - - Returns a list of all included schema files - -$bool = WriteSchemaIncludeList(\@list) - - Writes all schema includes preserving order. + Add an additional Schema item \@list = ReadAllowList() @@ -132,43 +120,43 @@ push @INC, '/usr/share/YaST2/modules/'; } -our $VERSION="1.1.0"; use strict; use vars qw(@ISA); -no warnings qw( uninitialized ); - use YaST::YCP; +use YaPI; use ycp; - -#use Locale::gettext; -#use POSIX (); # Needed for setlocale() - -#POSIX::setlocale(LC_MESSAGES, ""); +textdomain("ldap-server"); use Digest::MD5 qw(md5_hex); use Digest::SHA1 qw(sha1); use MIME::Base64; use X500::DN; -use YaPI; @YaPI::LdapServer::ISA = qw( YaPI ); -textdomain("ldap-server"); YaST::YCP::Import ("SCR"); YaST::YCP::Import ("Ldap"); +YaST::YCP::Import ("LdapServer"); YaST::YCP::Import ("Service"); +our $VERSION="1.2.0"; +our @CAPABILITIES = ( 'SLES9' ); our %TYPEINFO; -our @CAPABILITIES = ( - 'SLES9' - ); =item * C<\@dbList = ReadDatabaseList()> -Returns a List of databases (suffix). +Returns a List of databases. Each element of the list is a hash reference +with the following elements: + + * 'index' : The index of the database. Frontend Database has index -1, + config database has index 0 and first "real" database has index 1. + + * 'suffix': The base DN the database is servinng e.g. 'dc=example,dc=com' + + * 'type': The database type e.g. 'bdb' or 'config' EXAMPLE: @@ -184,13 +172,23 @@ =cut -BEGIN { $TYPEINFO{ReadDatabaseList} = ["function", ["list", "string"]]; } +BEGIN { $TYPEINFO{ReadDatabaseList} = ["function", ["list", [ "map", "string", "string"]] ]; } sub ReadDatabaseList { my $self = shift; - my $dbList = SCR->Read( ".ldapserver.databaselist" ); + my $rc = SCR->Execute('.ldapserver.init' ); + if ( ! $rc ) + { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_EXECUTE_FAILED"; + return $self->SetError(%{$err}); + } + + my $dbList = SCR->Read('.ldapserver.databases'); if(! defined $dbList) { - return $self->SetError(%{SCR->Error(".ldapserver")}); + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_READ_FAILED"; + return $self->SetError(%{$err}); } return $dbList; } @@ -204,7 +202,7 @@ Supported keys in %valueMap are: - * database: The database type (required) + * type: The database type (required) * suffix: The suffix (required) @@ -214,13 +212,17 @@ * rootdn: The Root DN - * passwd: The plain Root Password (requires rootdn) + * rootpw: The hashed RootDN Password (requires rootdn) + + * rootpw_clear: The plain Root Password (requires rootdn) * cryptmethod: The crypt method; allowed values are (CRYPT, SMD5, SHA, SSHA, PLAIN); default is 'SSHA' - * cachesize: The cachesize(bdb/ldbm) (optional; default 10000) + * entrycache: The cachesize (optional; default 10000) - * checkpoint: The checkpoint(bdb) (optional; default 1024 5) + * idlcache: The cachesize (optional; default 10000) + + * checkpoint: The bdb checkpoint setting as an array reference (optional; default [1024, 5]) If no rootdn and passwd is set, the base object is not added to the LDAP server. @@ -228,12 +230,12 @@ EXAMPLE: my $hash = { - database => 'bdb', - suffix => 'dc=example,dc=com', - rootdn => "cn=Admin,dc=example,dc=com", - passwd => "system", - cryptmethod => 'SMD5', - directory => "/var/lib/ldap/db1", + database => 'bdb', + suffix => 'dc=example,dc=com', + rootdn => "cn=Admin,dc=example,dc=com", + rootpw_clear => "system", + cryptmethod => 'SMD5', + directory => "/var/lib/ldap/db1", }; my $res = YaPI::LdapServer->AddDatabase($hash); @@ -250,30 +252,30 @@ my $self = shift; my $data = shift; - my $passwd_string = undef; - my $cryptMethod = "SSHA"; - my $cachesize = undef; + my $entrycache = undef; + my $idlcache = undef; my $checkpoint = undef; - my $hash = {}; my $addDBHash = {}; + my $cryptMethod = "SSHA"; + y2debug("YaPI::LdapServer.pm AddDatabase: ".Data::Dumper->Dump([$data])); ################ # check database ################ - if(!defined $data->{database} || $data->{database} eq "") { + if(!defined $data->{type} || $data->{type} eq "") { # error message at parameter check return $self->SetError(summary => "Missing parameter 'database'", code => "PARAM_CHECK_FAILED"); } - if ( !grep( ($_ eq $data->{database}), ("bdb", "ldbm") ) ) { + if ( !grep( ($_ eq $data->{type}), ("bdb", "hdb") ) ) { return $self->SetError(summary => sprintf( # error at paramter check - __("Database type '%s' is not supported. Allowed are 'bdb' and 'ldbm'."), - $data->{database}), + __("Database type '%s' is not supported. Allowed are 'bdb' and 'hdb'."), + $data->{type}), code => "PARAM_CHECK_FAILED"); } - $addDBHash->{type} = $data->{database}; + $addDBHash->{type} = $data->{type}; ################ # check suffix @@ -372,28 +374,31 @@ description => "'$data->{rootdn}' must be below the '$data->{suffix}'", code => "PARAM_CHECK_FAILED"); } - $hash->{rootdn} = $data->{rootdn}; + $addDBHash->{rootdn} = $data->{rootdn}; } ############################## # check passwd and cryptmethod ############################## - if(exists $data->{passwd}) { + if(exists $data->{rootpw}) { - if(!exists $hash->{rootdn} || $hash->{rootdn} eq "") { + if(!exists $addDBHash->{rootdn} || $addDBHash->{rootdn} eq "") { # parameter check failed return $self->SetError(summary => __("To set a password, you must define 'rootdn'."), code => "PARAM_CHECK_FAILED"); } - if((!defined $data->{passwd} || $data->{passwd} eq "") && - (! defined $data->{rootpw} || $data->{rootpw} eq "" ) ){ + if( (!defined $data->{rootpw} || $data->{rootpw} eq "") && + (!defined $data->{rootpw_clear} || $data->{rootpw_clear} eq "" ) ){ # parameter check failed - return $self->SetError(summary => __("Define 'passwd'."), + return $self->SetError(summary => __("Define 'rootpw'."), code => "PARAM_CHECK_FAILED"); } - if(defined $data->{passwd} && $data->{passwd} ne "") { + + if( (! defined $data->{rootpw} || $data->{rootpw} eq "") && + ( defined $data->{rootpw_clear} && $data->{rootpw_clear} ne "") ) { + if(defined $data->{cryptmethod} && $data->{cryptmethod} ne "") { $cryptMethod = $data->{cryptmethod}; } @@ -404,32 +409,33 @@ $cryptMethod), code => "PARAM_CHECK_FAILED"); } + my $passwd_string = ""; if( $cryptMethod eq "CRYPT" ) { my $salt = pack("C2",(int(rand 26)+65),(int(rand 26)+65)); - $passwd_string = crypt $data->{passwd},$salt; + $passwd_string = crypt $data->{rootpw_clear},$salt; $passwd_string = "{crypt}".$passwd_string; } elsif( $cryptMethod eq "SMD5" ) { my $salt = pack("C5",(int(rand 26)+65),(int(rand 26)+65),(int(rand 26)+65), (int(rand 26)+65), (int(rand 26)+65)); my $ctx = new Digest::MD5(); - $ctx->add($data->{passwd}); + $ctx->add($data->{rootpw_clear}); $ctx->add($salt); $passwd_string = "{smd5}".encode_base64($ctx->digest.$salt, ""); } elsif( $cryptMethod eq "SHA"){ - my $digest = sha1($data->{passwd}); + my $digest = sha1($data->{rootpw_clear}); $passwd_string = "{sha}".encode_base64($digest, ""); } elsif( $cryptMethod eq "SSHA"){ my $salt = pack("C5",(int(rand 26)+65),(int(rand 26)+65),(int(rand 26)+65), (int(rand 26)+65), (int(rand 26)+65)); - my $digest = sha1($data->{passwd}.$salt); + my $digest = sha1($data->{rootpw_clear}.$salt); $passwd_string = "{ssha}".encode_base64($digest.$salt, ""); } else { - $passwd_string = $data->{passwd}; + $passwd_string = $data->{rootpw_clear}; } - $hash->{rootpw} = $passwd_string; + $addDBHash->{rootpw} = $passwd_string; } else { - $hash->{rootpw} = $data->{rootpw}; + $addDBHash->{rootpw} = $data->{rootpw}; } } @@ -458,72 +464,98 @@ code => "DIR_DOES_NOT_EXIST"); } } - $hash->{directory} = $data->{directory}; + my $owner = SCR->Read('.sysconfig.openldap.OPENLDAP_USER'); + my $group = SCR->Read('.sysconfig.openldap.OPENLDAP_GROUP'); + if ( SCR->Execute(".target.bash", "chown ".$owner.":".$group." ".$data->{directory}) ) + { + return $self->SetError( summary => _("Could adjust ownership of database directory."), + description => "", + code => "DIR_CHOWN_FAILED" ); + } + + $addDBHash->{directory} = $data->{directory}; ################## - # check cachesize + # check cachesizes ################## - if(defined $data->{cachesize} && $data->{cachesize} ne "") { + if(defined $data->{entrycache} && $data->{entrycache} ne "") { - if($data->{cachesize} !~ /^\d+$/) { + if($data->{entrycache} !~ /^\d+$/) { return $self->SetError(summary => __("Invalid cache size value."), - description => "cachesize = '".$data->{cachesize}."'. Must be a integer value", + description => "entrycache = '".$data->{entrycache}."'. Must be a integer value", code => "PARAM_CHECK_FAILED"); } - $cachesize = $data->{cachesize}; + $entrycache = $data->{entrycache}; } - if(! exists $data->{cachesize}) { + if(! exists $data->{entrycache}) { # set default if parameter does not exist - $cachesize = 10000; + $entrycache = 10000; } - $hash->{cachesize} = $cachesize; + $addDBHash->{entrycache} = YaST::YCP::Integer($entrycache); - if($data->{database} eq "bdb") { + if(defined $data->{idlcache} && $data->{idlcache} ne "") { + + if($data->{idlcache} !~ /^\d+$/) { + return $self->SetError(summary => __("Invalid cache size value."), + description => "idlcache = '".$data->{idlcache}."'. Must be a integer value", + code => "PARAM_CHECK_FAILED"); + } + $idlcache = $data->{idlcache}; + } + if(! exists $data->{idlcache}) { + # set default if parameter does not exist + $idlcache = 10000; + } + $addDBHash->{idlcache} = YaST::YCP::Integer($idlcache); + + + if( ($data->{type} eq "bdb") && ($data->{type} eq "hdb" ) ){ ################## # check checkpoint ################## - if(defined $data->{checkpoint} && $data->{checkpoint} ne "") { - my @cp = split(/\s+/, $data->{checkpoint}); + if(defined $data->{checkpoint} && (scalar($data->{checkpoint}) != 2) ) { + my @cp = @{$data->{checkpoint} }; if(!defined $cp[0] || !defined $cp[1] || $cp[0] !~ /^\d+$/ || $cp[1] !~ /^\d+$/) { return $self->SetError(summary => __("Invalid checkpoint value."), description => "checkpoint = '".$data->{checkpoint}."'.\n Must be two integer values seperated by space.", code => "PARAM_CHECK_FAILED"); } - $checkpoint = $cp[0]." ".$cp[1]; + $checkpoint = $data->{checkpoint}; } if(! exists $data->{checkpoint}) { # set default if parameter does not exist - $checkpoint = "1024 5"; + $checkpoint = ["1024, 5"]; } - $hash->{checkpoint} = $checkpoint; - } - if ( exists $data->{'overlay'} ){ - $hash->{'overlay'} = $data->{'overlay'}; + $addDBHash->{checkpoint} = [ YaST::YCP::Integer($checkpoint->[0]), YaST::YCP::Integer( $checkpoint->[1] ) ]; } +# if ( exists $data->{'overlay'} ){ +# $addDBHash->{'overlay'} = $data->{'overlay'}; +# } - if(SCR->Read(".target.size", $hash->{directory}."/DB_CONFIG") < 0) { + if(SCR->Read(".target.size", $addDBHash->{directory}."/DB_CONFIG") < 0) { my $DB_CONFIG = "set_cachesize 0 15000000 1\n". "set_lg_bsize 2097152\n". "set_lg_regionmax 262144\n". "set_flags DB_LOG_AUTOREMOVE\n"; - if(! SCR->Write(".target.string", $hash->{directory}."/DB_CONFIG", $DB_CONFIG)) { + if(! SCR->Write(".target.string", $addDBHash->{directory}."/DB_CONFIG", $DB_CONFIG)) { return $self->SetError(summary => "Can not create DB_CONFIG file.", code => "SCR_WRITE_FAILED"); } } - if(! defined SCR->Execute(".ldapserver.adddatabase", $addDBHash)) { - return $self->SetError(%{SCR->Error(".ldapserver")}); - } - - if(! SCR->Write(".ldapserver.database", $data->{suffix}, $hash)) { - return $self->SetError(%{SCR->Error(".ldapserver")}); + if ( ! SCR->Write(".ldapserver.database.new.", $addDBHash ) ) + { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_WRITE_FAILED"; + return $self->SetError(%{$err}); } - if(! $self->SwitchService(1)) { - return undef; + if(! SCR->Execute(".ldapserver.commitChanges") ) { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_EXECUTE_FAILED"; + return $self->SetError(%{$err}); } # do not add the base entry, if we have nothing to bind with. @@ -586,21 +618,16 @@ * rootdn: The Root DN - * passwd: The Root Password - - * cryptmethod: The crypt method; allowed values are (CRYPT, SMD5, SHA, SSHA, PLAIN); default is 'SSHA' + * rootpw: The Root Password - * cachesize: The cachesize(bdb/ldbm) + * rootpw_clear: The cleartext Root Password - * checkpoint: The checkpoint(bdb) + * cryptmethod: The crypt method; allowed values are (CRYPT, SMD5, SHA, SSHA, PLAIN); default is 'SSHA' -If the key is defined, but the value is 'undef' the option will be deleted. If a key is not defined, the option is not changed. If the key is defined and a value is specified, this value will be set. -cryptmethod can not be deleted. It will be deleted if you delete passwd. - -If you delete rootdn, passwd is also deleted. +If you delete rootdn, rootpw is also deleted. EXAMPLE: @@ -637,14 +664,34 @@ return $self->SetError(summary => "Missing 'data'", code => "PARAM_CHECK_FAILED"); } - y2debug("YaPI::LdapServer.pm EditDatabase: ".Data::Dumper->Dump([$data])); + y2milestone("YaPI::LdapServer.pm EditDatabase: $suffix: ".Data::Dumper->Dump([$data])); + + # check if database exists and find index + my $dblist = $self->ReadDatabaseList(); + y2milestone("EditDatabase: ".Data::Dumper->Dump([$dblist])); + my $index = -2; + + foreach my $db (@{$dblist}) + { + if ( $db->{'suffix'} eq $suffix) + { + $index = $db->{'index'}; + } + } + + if ( $index <= 0 ) + { + return $self->SetError(summary => "Database does not exist", + code => "DATABASE_NOT_FOUND"); + } + ################### # work on rootdn ################### if(exists $data->{rootdn} && ! defined $data->{rootdn}) { $editHash->{rootdn} = undef; - $data->{passwd} = undef; # delete also passwd + $data->{rootpw} = undef; # delete also passwd } elsif(exists $data->{rootdn}) { if(! defined X500::DN->ParseRFC2253($data->{rootdn})) { @@ -668,18 +715,18 @@ ################### # work on passwd ################### - if(exists $data->{passwd} && ! defined $data->{passwd}) { - + if(exists $data->{rootpw} && ! defined $data->{rootpw}) { $editHash->{rootpw} = undef; - - } elsif(exists $data->{passwd}) { + } elsif ( exists $data->{rootpw} && defined $data->{rootpw} && $data->{rootpw} ne "" ) { + $editHash->{rootpw} = $data->{rootpw}; + } elsif(exists $data->{rootpw_clear}) { - if(!defined $data->{passwd} || $data->{passwd} eq "") { + if(!defined $data->{rootpw_clear} || $data->{rootpw_clear} eq "") { # parameter check failed return $self->SetError(summary => __("Define 'passwd'."), code => "PARAM_CHECK_FAILED"); } - if(!defined $data->{passwd} || $data->{passwd} eq "") { + if(!defined $data->{rootpw_clear} || $data->{rootpw_clear} eq "") { # parameter check failed return $self->SetError(summary => __("Define 'passwd'."), code => "PARAM_CHECK_FAILED"); @@ -698,109 +745,43 @@ if( $cryptMethod eq "CRYPT" ) { my $salt = pack("C2",(int(rand 26)+65),(int(rand 26)+65)); - $passwd_string = crypt $data->{passwd},$salt; + $passwd_string = crypt $data->{rootpw_clear},$salt; $passwd_string = "{crypt}".$passwd_string; } elsif( $cryptMethod eq "SMD5" ) { my $salt = pack("C5",(int(rand 26)+65),(int(rand 26)+65),(int(rand 26)+65), (int(rand 26)+65), (int(rand 26)+65)); my $ctx = new Digest::MD5(); - $ctx->add($data->{passwd}); + $ctx->add($data->{rootpw_clear}); $ctx->add($salt); $passwd_string = "{smd5}".encode_base64($ctx->digest.$salt, ""); } elsif( $cryptMethod eq "SHA"){ - my $digest = sha1($data->{passwd}); + my $digest = sha1($data->{rootpw_clear}); $passwd_string = "{sha}".encode_base64($digest, ""); } elsif( $cryptMethod eq "SSHA"){ my $salt = pack("C5",(int(rand 26)+65),(int(rand 26)+65),(int(rand 26)+65), (int(rand 26)+65), (int(rand 26)+65)); - my $digest = sha1($data->{passwd}.$salt); + my $digest = sha1($data->{rootpw_clear}.$salt); $passwd_string = "{ssha}".encode_base64($digest.$salt, ""); } else { - $passwd_string = $data->{passwd}; + $passwd_string = $data->{rootpw_clear}; } # set new rootpw $editHash->{rootpw} = $passwd_string; } - ################### - # work on cachesize - ################### - if(exists $data->{cachesize} && !defined $data->{cachesize}) { - # Delete cachesize option - - $editHash->{cachesize} = undef; - - } elsif(exists $data->{cachesize}) { - - if(defined $data->{cachesize} && $data->{cachesize} ne "") { - - if($data->{cachesize} !~ /^\d+$/) { - return $self->SetError(summary => __("Invalid cache size value."), - description => "cachesize = '".$data->{cachesize}."'. Must be a integer value", - code => "PARAM_CHECK_FAILED"); - } - # set new cachesize - - $editHash->{cachesize} = $data->{cachesize}; - - } else { - return $self->SetError(summary => __("Invalid cache size value."), - description => "cachesize = '".$data->{cachesize}."'. Must be a integer value", - code => "PARAM_CHECK_FAILED"); - } - } - - #################### - # work on checkpoint - #################### - if(exists $data->{checkpoint}) { - - if(!defined $data->{checkpoint}) { - # Delete checkpoint option - - $editHash->{checkpoint} = undef; - - } else { - - my $db = $self->ReadDatabase($suffix); - return undef if(! defined $db); - - if($db->{database} eq "bdb") { - - if($data->{checkpoint} ne "") { - my @cp = split(/\s+/, $data->{checkpoint}); - if(!defined $cp[0] || !defined $cp[1] || - $cp[0] !~ /^\d+$/ || $cp[1] !~ /^\d+$/) { - - return $self->SetError(summary => __("Invalid checkpoint value."), - description => "checkpoint = '".$data->{checkpoint}."'.\n Must be two integer values seperated by space.", - code => "PARAM_CHECK_FAILED"); - } - my $checkpoint = $cp[0]." ".$cp[1]; - # set new checkpoint - - $editHash->{checkpoint} = $checkpoint; - - } else { - return $self->SetError(summary => __("Invalid checkpoint value."), - description => "checkpoint = '".$data->{checkpoint}."'.\n Must be two integer values seperated by space.", - code => "PARAM_CHECK_FAILED"); - } - } - } - } - if ( exists $data->{'overlay'} ){ - $editHash->{'overlay'} = $data->{'overlay'}; - } - - y2debug("YaPI::EditDatabase ". Data::Dumper->Dump([$data]) ); y2debug("YaPI::EditDatabase edithash: ". Data::Dumper->Dump([$editHash]) ); - if(! SCR->Write(".ldapserver.database", $suffix, $editHash)) { + if(! SCR->Write(".ldapserver.database.{$index}" , $editHash)) { my $err = SCR->Error(".ldapserver"); $err->{description} = $err->{summary}."\n\n".$err->{description}; $err->{summary} = __("Database edit failed."); + $err->{code} = "SCR_WRITE_FAILED"; + return $self->SetError(%{$err}); + } + if(! SCR->Execute(".ldapserver.commitChanges") ) { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_EXECUTE_FAILED"; return $self->SetError(%{$err}); } @@ -814,21 +795,24 @@ Returned keys in %valueMap are: - * database: The database type + * type: The database type * suffix: The suffix * rootdn: The Root DN - * passwd: The Root Password + * rootpw: The Root Password Hash - * directory: The Directory where the database files are(bdb/ldbm) + * directory: The Directory where the database files are (bdb/hdb) - * cachesize: The cachesize(bdb/ldbm) + * entrycache: The size of the entrycache - * checkpoint: The checkpoint(bdb) + * idlcache: The size of the idlcache + + * checkpoint: The checkpoint setting (A reference to a list see + AddDatabase() -There can be some more, if they are in this databse section. +There can be some more, depending on the database's configuration EXAMPLE: @@ -854,27 +838,53 @@ return $self->SetError(summary => __("Missing parameter 'suffix'."), code => "PARAM_CHECK_FAILED"); } - my $dbHash = SCR->Read( ".ldapserver.database", $suffix ); - if(! defined $dbHash) { - return $self->SetError(%{SCR->Error(".ldapserver")}); + # check if database exists and find index + my $dblist = $self->ReadDatabaseList(); + my $index = -2; + my $type = ""; + + foreach my $db (@{$dblist}) + { + if ( $db->{'suffix'} eq $suffix) + { + $index = $db->{'index'}; + $type = $db->{'type'}; + } + } + + if ( $index <= 0 ) + { + return $self->SetError(summary => "Database does not exist", + code => "DATABASE_NOT_FOUND"); } - if(exists $dbHash->{index}) { - # we have a special function to maintain 'index' - delete $dbHash->{index}; + + my $dbHash = SCR->Read( ".ldapserver.database.{$index}" ); + if(! defined $dbHash) { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_READ_FAILED"; + return $self->SetError(%{$err}); } + $dbHash->{'type'} = $type; return $dbHash; } =item * C<\@indexList = ReadIndex($suffix)> -Returns a List of Maps with all index statements for this database. The "keys" are: - - * 'attr', an attribute or an attribute list - - * 'param', a number of special index parameters - - * 'md5', a MD5 sum of this index. This numer is needed for EditIndex and DeleteIndex +Returns a Map of Maps with all defined indexes for a database. The keys of +the outer Map are LDAP Attribute Type (e.g. 'objectClass'), the keys in the +inner Maps are booleans for the specific type of indexes. + + { + 'objectClass' => { + 'eq' => 1 + }, + 'cn' => { + 'sub' => 1, + 'pres' => 1, + 'eq' => 1 + } + } EXAMPLE: @@ -894,316 +904,127 @@ sub ReadIndex { my $self = shift; my $suffix = shift; - my @idxList = (); if(! defined $suffix || $suffix eq "") { # error message at parameter check return $self->SetError(summary => __("Missing parameter 'suffix'."), code => "PARAM_CHECK_FAILED"); } - my $dbHash = SCR->Read( ".ldapserver.database", $suffix ); - unless ( ( defined $dbHash) && (%$dbHash) ){ - return $self->SetError(%{SCR->Error(".ldapserver")}); - } - if(exists $dbHash->{index} && defined $dbHash->{index} && - ref $dbHash->{index} eq "ARRAY") { - - foreach my $idx (@{$dbHash->{index}}) { - my $idxHash = {}; - - my ($attr, $method, $empty) = split(/\s+/, $idx); - if(!(! defined $empty || $empty eq "")) { - return $self->SetError(summary => "Index parsing error.", - code => "PARSING_ERROR"); - } - - $idxHash->{attr} = $attr; - $idxHash->{param} = $method; - - my $md5 = md5_hex( $attr." ".$method ); - $idxHash->{md5} = $md5; - push @idxList, $idxHash; - } - - } - return \@idxList; -} + my $dblist = $self->ReadDatabaseList(); + my $index = -2; -=item * -C<$bool = AddIndex($suffix,\%indexMap)> - -Add a new index statement B<%indexMap> to the database section B<$suffix>. - -The indexMap has two keys - - * 'attr', an attribute or an attribute list - - * 'param', a number of special index parameters - -EXAMPLE: - - my $newIndex = { - 'attr' => "uid,cn", - 'param' => "eq" - }; - - my $res = YaPI::LdapServer->AddIndex("dc=example,dc=com", $newIndex); - if( not defined $res ) { - # error - } else { - print "OK: \n"; - } - -=cut - -BEGIN { $TYPEINFO{AddIndex} = ["function", "boolean", "string", [ "map", "string", "string"] ]; } -sub AddIndex { - my $self = shift; - my $suffix = shift; - my $indexHash = shift; - my $orig_idxArray = undef; - my @new_idx = (); - - if(!defined $suffix || $suffix eq "") { - return $self->SetError(summary => "Missing parameter 'suffix'", - code => "PARAM_CHECK_FAILED"); - } - if(!defined $indexHash || !defined $indexHash->{attr} || - !defined $indexHash->{param} ) { - return $self->SetError(summary => "Missing parameter 'index'", - code => "PARAM_CHECK_FAILED"); - } - - my $md5 = md5_hex( $indexHash->{attr}." ".$indexHash->{param} ); - - $orig_idxArray = $self->ReadIndex($suffix); - if(! defined $orig_idxArray) { - return $self->SetError( summary => "Database '$suffix' does not exist", - code => "PARAM_CHECK_FAILED" ); - } - - foreach my $idx (@{$orig_idxArray}) { - if($idx->{md5} eq $md5) { - return $self->SetError(summary => "Index already exists", - code => "PARAM_CHECK_FAILED"); + foreach my $db (@{$dblist}) + { + if ( $db->{'suffix'} eq $suffix) + { + $index = $db->{'index'}; } - push @new_idx, $idx->{attr}." ".$idx->{param}; } - push @new_idx, $indexHash->{attr}." ".$indexHash->{param}; - if(! SCR->Write(".ldapserver.database", $suffix, { index => \@new_idx })) { - return $self->SetError(%{SCR->Error(".ldapserver")}); + if ( $index <= 0 ) + { + return $self->SetError(summary => "Database does not exist", + code => "DATABASE_NOT_FOUND"); } - return 1; + + my $idxList = SCR->Read( ".ldapserver.database.{$index}.indexes" ); + + return $idxList; } =item * -C<$bool = EditIndex($suffix,$index_md5,\%indexMap)> +C<$bool = EditIndex($suffix,\%indexMap)> + +Add/or change the indexing of a single AttributeType. + +The indexMap has up to four keys -Replace the index B<$index_md5> in the database section B<$suffix> by the new index -statement B<%indexMap>. + * 'name', A single AttributeType -The indexMap has two keys + * 'eq', A boolean to indicate whether an equality index should be created - * 'attr', an attribute or an attribute list + * 'sub', A boolean to indicate whether a substring index should be created - * 'param', a number of special index parameters + * 'pres', A boolean to indicate whether a presence index should be created EXAMPLE: my $newIndex = { - 'attr' => "uid,cn", - 'param' => "eq" + 'name' => "uid", + 'eq' => 1, + 'pres' => 1, + 'sub' => 0 }; - my $res = YaPI::LdapServer->EditIndex("dc=example,dc=com", "eacc11456b6c2ae4e1aef0fa287e02b0", - $newIndex); + my $res = YaPI::LdapServer->EditIndex("dc=example,dc=com", $newIndex); if( not defined $res ) { # error } else { - print "OK: \n"; + print "OK: \n"; } =cut -BEGIN { $TYPEINFO{EditIndex} = ["function", "boolean", "string", "string", - [ "map", "string", "string"]]; } +BEGIN { $TYPEINFO{EditIndex} = ["function", "boolean", "string", [ "map", "string", "any"] ]; } sub EditIndex { my $self = shift; my $suffix = shift; - my $idx_md5 = shift; my $indexHash = shift; my $orig_idxArray = undef; my @new_idx = (); - my $found = 0; - if(!defined $suffix) { + if(!defined $suffix || $suffix eq "") { return $self->SetError(summary => "Missing parameter 'suffix'", code => "PARAM_CHECK_FAILED"); } - - if(!defined $idx_md5 || $idx_md5 !~ /^[[:xdigit:]]+$/ ) { - return $self->SetError(summary => "Missing parameter 'idx_md5'", - code => "PARAM_CHECK_FAILED"); - } - - if(!defined $indexHash || !defined $indexHash->{attr} || - !defined $indexHash->{param} ) { + if(!defined $indexHash || !defined $indexHash->{name} ) { return $self->SetError(summary => "Missing parameter 'index'", code => "PARAM_CHECK_FAILED"); } - $orig_idxArray = $self->ReadIndex($suffix); - if(! defined $orig_idxArray) { - return $self->SetError(%{SCR->Error(".ldapserver")}); - } - - foreach my $idx (@{$orig_idxArray}) { - if($idx->{md5} eq $idx_md5) { - push @new_idx, $indexHash->{attr}." ".$indexHash->{param}; - $found = 1; - } else { - push @new_idx, $idx->{attr}." ".$idx->{param}; - } - } - if(!$found) { - return $self->SetError(summary => "No such 'index'.", - description => "MD5 '$idx_md5' not found in this database", - code => "PARAM_CHECK_FAILED"); - } - - if(! SCR->Write(".ldapserver.database", $suffix, { index => \@new_idx })) { - return $self->SetError(%{SCR->Error(".ldapserver")}); - } - return 1; -} + my $dblist = $self->ReadDatabaseList(); + my $index = -2; -=item * -C<$bool = DeleteIndex($suffix,$index_md5)> - -Delete the index B<$index_md5> statement in the database section B<$suffix>. - -EXAMPLE: - - my $res = YaPI::LdapServer->DeleteIndex("dc=example,dc=com", "338a980b4eebe87365a4077067ce1559"); - if( not defined $res ) { - # error - } else { - print "OK: \n"; - } - -=cut - -BEGIN { $TYPEINFO{DeleteIndex} = ["function", "boolean", "string", "string" ]; } -sub DeleteIndex { - my $self = shift; - my $suffix = shift; - my $idx_md5 = shift; - my $orig_idxArray = undef; - my @new_idx = (); - my $found = 0; - - if(!defined $suffix) { - return $self->SetError(summary => "Missing parameter 'suffix'", - code => "PARAM_CHECK_FAILED"); - } - - if(!defined $idx_md5 || $idx_md5 !~ /^[[:xdigit:]]+$/ ) { - return $self->SetError(summary => "Missing parameter 'idx_md5'", - code => "PARAM_CHECK_FAILED"); - } - - $orig_idxArray = $self->ReadIndex($suffix); - if(! defined $orig_idxArray) { - return $self->SetError(%{SCR->Error(".ldapserver")}); - } - - foreach my $idx (@{$orig_idxArray}) { - if($idx->{md5} eq $idx_md5) { - $found = 1; - } else { - push @new_idx, $idx->{attr}." ".$idx->{param}; + foreach my $db (@{$dblist}) + { + if ( $db->{'suffix'} eq $suffix) + { + $index = $db->{'index'}; } } - if(!$found) { - return $self->SetError(summary => "No such 'index'.", - description => "MD5 '$idx_md5' not found in this database", - code => "PARAM_CHECK_FAILED"); - } - if(! SCR->Write(".ldapserver.database", $suffix, { index => \@new_idx })) { - return $self->SetError(%{SCR->Error(".ldapserver")}); - } - return 1; -} - -=item * -C<$bool = RecreateIndex($suffix)> - -Regenerate indices based upon the current contents of a -database determined by $suffix. This function stops the -ldapserver, call slapindex and start the ldapserver again. - -EXAMPLE: - - my $res = YaPI::LdapServer->RecreateIndex("dc=example,dc=com"); - if( not defined $res ) { - # error - } else { - print "OK: \n"; - } - -=cut - -BEGIN { $TYPEINFO{RecreateIndex} = ["function", "boolean", "string" ]; } -sub RecreateIndex { - my $self = shift; - my $suffix = shift; - my $err = 0; - - if(!defined $suffix || $suffix eq "") { - return $self->SetError(summary => "Missing parameter 'suffix'", - code => "PARAM_CHECK_FAILED"); - } - - my $object = X500::DN->ParseRFC2253($suffix); - if(! defined $object) { - return $self->SetError(summary => "Wrong parameter 'suffix'", - description => "'$suffix' is no DN", - code => "PARAM_CHECK_FAILED"); - } - - if(! $self->SwitchService(0)) { - return undef; + if ( $index <= 0 ) + { + return $self->SetError(summary => "Database does not exist", + code => "DATABASE_NOT_FOUND"); } - $suffix = $object->getRFC2253String(); - - if(0 != SCR->Execute(".target.bash", "slapindex -b '$suffix'") ) { - $err = 1; - } - - if(! $self->SwitchService(1)) { - return undef; + $indexHash->{'pres'} = YaST::YCP::Boolean($indexHash->{'pres'}); + $indexHash->{'eq'} = YaST::YCP::Boolean($indexHash->{'eq'}); + $indexHash->{'sub'} = YaST::YCP::Boolean($indexHash->{'sub'}); + if(! SCR->Write(".ldapserver.database.{$index}.index", $indexHash) ) { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_WRITE_FAILED"; + return $self->SetError(%{$err}); } - - if($err) { - return $self->SetError(summary => "Can not create new index", - code => "SCR_EXECUTE_FAILED"); + if(! SCR->Execute(".ldapserver.commitChanges") ) { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_EXECUTE_FAILED"; + return $self->SetError(%{$err}); } return 1; } =item * -C<\@list = ReadSchemaIncludeList()> +C<\@list = ReadSchemaList()> -Returns a list of all included schema files in the order they appear in the config files. +Returns a list of all included schemas items EXAMPLE: use Data::Dumper; - my $res = YaPI::LdapServer->ReadSchemaIncludeList(); + my $res = YaPI::LdapServer->ReadSchemaList(); if( not defined $res ) { # error } else { @@ -1213,41 +1034,28 @@ =cut -BEGIN { $TYPEINFO{ReadSchemaIncludeList} = ["function", ["list", "string"] ]; } -sub ReadSchemaIncludeList { +BEGIN { $TYPEINFO{ReadSchemaList} = ["function", ["list", "string"] ]; } +sub ReadSchemaList { my $self = shift; - my $global = SCR->Read( ".ldapserver.global" ); - if(! defined $global) { - return $self->SetError(%{SCR->Error(".ldapserver")}); - } - if(exists $global->{schemainclude} && defined $global->{schemainclude} && - ref $global->{schemainclude} eq "ARRAY") { - return $global->{schemainclude}; + my $schemaList = SCR->Read( ".ldapserver.schemaList" ); + if(! defined $schemaList) { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_READ_FAILED"; + return $self->SetError(%{$err}); } - return (); + return $schemaList; } =item * -C<$bool = WriteSchemaIncludeList(\@list)> +C<$bool = AddSchema($file)> -Writes all schema includes preserving order. - -You have to restart the LDAP Server with YaPI::LdapServer->SwitchService(1) -to activate these changes. +Adds an additional schema item. $file is the absolute pathname of the file +to add. It can either be in .schema or LDIF format. EXAMPLE: - my $schemas = [ - '/etc/openldap/schema/core.schema', - '/etc/openldap/schema/cosine.schema', - '/etc/openldap/schema/inetorgperson.schema', - '/etc/openldap/schema/rfc2307bis.schema', - '/etc/openldap/schema/yast2userconfig.schema', - '/etc/openldap/schema/samba3.schema' - ]; - - my $res = YaPI::LdapServer->WriteSchemaIncludeList($schemas); + my $res = YaPI::LdapServer->AddSchema("/etc/openldap/schema/ppolicy.schema"); if( not defined $res ) { # error } else { @@ -1256,26 +1064,41 @@ =cut -BEGIN { $TYPEINFO{WriteSchemaIncludeList} = ["function", "boolean", ["list", "string"] ]; } -sub WriteSchemaIncludeList { +BEGIN { $TYPEINFO{AddSchema} = ["function", "boolean", ["list", "string"] ]; } +sub AddSchema { my $self = shift; - my $incList = shift; + my $file = shift; - if(!defined $incList || ref($incList) ne "ARRAY" ) { - return $self->SetError(summary => "Include list is missing", + if(!defined $file || $file eq "" ) { + return $self->SetError(summary => "File name is missing", code => "PARAM_CHECK_FAILED"); } + + my $ret = 0; - foreach my $path (@{$incList}) { - if(! -e $path) { - return $self->SetError(summary => "File does not exist.", - description => "'$path' does not exist", - code => "PARAM_CHECK_FAILED"); - } + if ( $file =~ /.schema$/ ) + { + $ret = SCR->Write(".ldapserver.schema.addFromSchemafile", $file ); } - - if(! SCR->Write(".ldapserver.global", { schemainclude => $incList })) { - return $self->SetError(%{SCR->Error(".ldapserver")}); + elsif ( $file =~ /.ldif$/ ) + { + $ret = SCR->Write(".ldapserver.schema.addFromLdif", $file ); + } + else + { + return $self->SetError(summary => "File format not supported", + code => "SCHEMA_UNKNOWN_FORMAT"); + } + + if (! $ret ) { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_EXECUTE_FAILED"; + return $self->SetError(%{$err}); + } + if(! SCR->Execute(".ldapserver.commitChanges") ) { + my $err = SCR->Error(".ldapserver"); + $err->{'code'} = "SCR_EXECUTE_FAILED"; + return $self->SetError(%{$err}); } return 1; } Modified: trunk/ldap-server/testsuite/full-test.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/testsuite/full-test.… ============================================================================== --- trunk/ldap-server/testsuite/full-test.pl (original) +++ trunk/ldap-server/testsuite/full-test.pl Tue Aug 5 16:24:08 2008 @@ -14,56 +14,8 @@ print "$pwd\n"; exit 1 if (!defined $pwd || $pwd eq ""); -my $new_database = 'o=MÃ¼ller GmbH & Co/KG,c=com'; +my $new_database = 'o=MÃ¼ller GmbH & Co/KG,c=DE'; -init_testsetup(); - -T39_ReadSLPEnabled(); -T40_WriteSLPEnabled(); - -exit; - -T01_Interface(); -T02_Version(); -T03_Capabilities(); -T04_ReadDatabaseList(); -T05_ReadDatabase(); -T06_ReadIndex(); -T07_ReadSchemaIncludeList(); -T08_ReadAllowList(); -T21_ReadTLS(); -T09_AddDatabase(); -T10_EditDatabase(); -T11_AddIndex(); -T14_RecreateIndex(); -T23_ReadIndex2(); -T12_EditIndex(); -T14_RecreateIndex(); -T23_ReadIndex2(); -T13_DeleteIndex(); -T14_RecreateIndex(); -T15_WriteSchemaIncludeList(); -T16_WriteAllowList(); -T17_AddLoglevel(); -T18_DeleteLoglevel(); -T19_WriteLoglevel(); -T20_ReadLoglevel(); -T22_WriteTLS(); - -T04_ReadDatabaseList(); -T35_ReadDatabase2(); -T36_ReadIndex2(); -T07_ReadSchemaIncludeList(); -T08_ReadAllowList(); -T21_ReadTLS(); - -T37_CheckCommonServerCertificate(); -T38_ConfigureCommonServerCertificate(); -T21_ReadTLS(); - -T39_ReadSLPEnabled(); -T40_WriteSLPEnabled(); - sub printError { my $err = shift; foreach my $k (keys %$err) { @@ -156,7 +108,7 @@ print STDERR "------------------- T05_ReadDatabase ---------------------\n"; print "------------------- T05_ReadDatabase ---------------------\n"; - my $res = YaPI::LdapServer->ReadDatabase('"dc=suse,dc=de"'); + my $res = YaPI::LdapServer->ReadDatabase($new_database); if( not defined $res ) { my $msg = YaPI::LdapServer->Error(); printError($msg); @@ -170,7 +122,7 @@ print STDERR "------------------- T06_ReadIndex ---------------------\n"; print "------------------- T06_ReadIndex ---------------------\n"; - my $res = YaPI::LdapServer->ReadIndex('"dc=suse,dc=de"'); + my $res = YaPI::LdapServer->ReadIndex("dc=site"); if( not defined $res ) { my $msg = YaPI::LdapServer->Error(); printError($msg); @@ -180,11 +132,11 @@ } } -sub T07_ReadSchemaIncludeList { - print STDERR "------------------- T07_ReadSchemaIncludeList ---------------------\n"; - print "------------------- T07_ReadSchemaIncludeList ---------------------\n"; +sub T07_ReadSchemaList { + print STDERR "------------------- T07_ReadSchemaList ---------------------\n"; + print "------------------- T07_ReadSchemaList ---------------------\n"; - my $res = YaPI::LdapServer->ReadSchemaIncludeList(); + my $res = YaPI::LdapServer->ReadSchemaList(); if( not defined $res ) { my $msg = YaPI::LdapServer->Error(); printError($msg); @@ -213,12 +165,13 @@ print "------------------- T09_AddDatabase ---------------------\n"; my $hash = { - database => 'bdb', + type => 'bdb', suffix => "$new_database", rootdn => 'cn=Admin,'."$new_database", - passwd => "system", + rootpw_clear => "system", cryptmethod => 'SMD5', directory => "/var/lib/ldap/SuSE_Test_DB", + createdatabasedir => 1 }; my $res = YaPI::LdapServer->AddDatabase($hash); @@ -235,24 +188,25 @@ print STDERR "------------------- T10_EditDatabase ---------------------\n"; print "------------------- T10_EditDatabase ---------------------\n"; - my $suffix = "$new_database"; + my $suffix = "dc=does_not_exists"; my $hash = { - rootdn => 'cn=Administrator,'."$new_database", + rootdn => 'cn=Administrator,'."$suffix", }; my $res = YaPI::LdapServer->EditDatabase($suffix, $hash); if( not defined $res ) { my $msg = YaPI::LdapServer->Error(); - printError($msg); - } else { print "OK: \n"; - print STDERR Data::Dumper->Dump([$res])."\n"; + print STDERR Data::Dumper->Dump([$msg])."\n"; + } else { + print "FAILED: \n"; + printError("This test should return an error"); } - $hash = { - passwd => "tralla", - cryptmethod => "CRYPT" - }; + $suffix = $new_database; + $hash = { + rootdn => 'cn=Administrator,'."$suffix", + }; $res = YaPI::LdapServer->EditDatabase($suffix, $hash); if( not defined $res ) { @@ -264,7 +218,8 @@ } $hash = { - cachesize => "20000", + rootpw_clear => "tralla", + cryptmethod => "CRYPT" }; $res = YaPI::LdapServer->EditDatabase($suffix, $hash); @@ -276,25 +231,38 @@ print STDERR Data::Dumper->Dump([$res])."\n"; } - $hash = { - checkpoint => "2048 10", - }; - - $res = YaPI::LdapServer->EditDatabase($suffix, $hash); - if( not defined $res ) { - my $msg = YaPI::LdapServer->Error(); - printError($msg); - } else { - print "OK: \n"; - print STDERR Data::Dumper->Dump([$res])."\n"; - } +# $hash = { +# cachesize => "20000", +# }; +# +# $res = YaPI::LdapServer->EditDatabase($suffix, $hash); +# if( not defined $res ) { +# my $msg = YaPI::LdapServer->Error(); +# printError($msg); +# } else { +# print "OK: \n"; +# print STDERR Data::Dumper->Dump([$res])."\n"; +# } +# +# $hash = { +# checkpoint => "2048 10", +# }; +# +# $res = YaPI::LdapServer->EditDatabase($suffix, $hash); +# if( not defined $res ) { +# my $msg = YaPI::LdapServer->Error(); +# printError($msg); +# } else { +# print "OK: \n"; +# print STDERR Data::Dumper->Dump([$res])."\n"; +# } } -sub T11_AddIndex { +sub T11_EditIndex { print STDERR "------------------- T11_AddIndex ---------------------\n"; print "------------------- T11_AddIndex ---------------------\n"; - my $res = YaPI::LdapServer->AddIndex("$new_database", { attr => "uid,cn", param => "eq"}); + my $res = YaPI::LdapServer->EditIndex("$new_database", { "name" => "uid", "eq" => 1, "pres" => 0}); if( not defined $res ) { my $msg = YaPI::LdapServer->Error(); printError($msg); @@ -302,14 +270,7 @@ print "OK: \n"; print STDERR Data::Dumper->Dump([$res])."\n"; } -} - -sub T12_EditIndex { - print STDERR "------------------- T12_EditIndex ---------------------\n"; - print "------------------- T12_EditIndex ---------------------\n"; - - my $res = YaPI::LdapServer->EditIndex("$new_database", "2de23a0b16b428bf1e175cba305d9563", - { attr => "uid,cn,gidnumber", param => "eq"}); + $res = YaPI::LdapServer->EditIndex("$new_database", { "name" => "cn", "eq" => 1, "pres" => 0}); if( not defined $res ) { my $msg = YaPI::LdapServer->Error(); printError($msg); @@ -319,6 +280,7 @@ } } + sub T13_DeleteIndex { print STDERR "------------------- T13_DeleteIndex ---------------------\n"; print "------------------- T13_DeleteIndex ---------------------\n"; @@ -333,34 +295,13 @@ } } -sub T14_RecreateIndex { - print STDERR "------------------- T14_RecreateIndex ---------------------\n"; - print "------------------- T14_RecreateIndex ---------------------\n"; - - my $res = YaPI::LdapServer->RecreateIndex("$new_database"); - if( not defined $res ) { - my $msg = YaPI::LdapServer->Error(); - printError($msg); - } else { - print "OK: \n"; - print STDERR Data::Dumper->Dump([$res])."\n"; - } -} - -sub T15_WriteSchemaIncludeList { - print STDERR "------------------- T15_WriteSchemaIncludeList ---------------------\n"; - print "------------------- T15_WriteSchemaIncludeList ---------------------\n"; +sub T15_AddSchema { + print STDERR "------------------- T15_AddSchema ---------------------\n"; + print "------------------- T15_AddSchema ---------------------\n"; - my $schemas = [ - '/etc/openldap/schema/core.schema', - '/etc/openldap/schema/cosine.schema', - '/etc/openldap/schema/inetorgperson.schema', - '/etc/openldap/schema/rfc2307bis.schema', - '/etc/openldap/schema/yast2userconfig.schema', - '/etc/openldap/schema/samba3.schema' - ]; + my $schemas = '/etc/openldap/schema/ppolicy.schema'; - my $res = YaPI::LdapServer->WriteSchemaIncludeList($schemas); + my $res = YaPI::LdapServer->AddSchema($schemas); if( not defined $res ) { my $msg = YaPI::LdapServer->Error(); printError($msg); @@ -495,7 +436,7 @@ print STDERR "------------------- T23_ReadIndex2 ---------------------\n"; print "------------------- T23_ReadIndex2 ---------------------\n"; - my $res = YaPI::LdapServer->ReadIndex("$new_database"); + my $res = YaPI::LdapServer->ReadIndex($new_database); if( not defined $res ) { my $msg = YaPI::LdapServer->Error(); printError($msg); @@ -591,3 +532,48 @@ } } +init_testsetup(); + +T39_ReadSLPEnabled(); +T40_WriteSLPEnabled(); +exit; +# +#T01_Interface(); +#T02_Version(); +#T03_Capabilities(); +T04_ReadDatabaseList(); +T06_ReadIndex(); +T07_ReadSchemaList(); +#T08_ReadAllowList(); +#T21_ReadTLS(); +#T09_AddDatabase(); +T10_EditDatabase(); +T05_ReadDatabase(); +T11_EditIndex(); +T23_ReadIndex2(); +#T12_EditIndex(); +#T23_ReadIndex2(); +#T13_DeleteIndex(); +T15_AddSchema(); +T07_ReadSchemaList(); +#T16_WriteAllowList(); +#T17_AddLoglevel(); +#T18_DeleteLoglevel(); +#T19_WriteLoglevel(); +#T20_ReadLoglevel(); +#T22_WriteTLS(); +# +#T04_ReadDatabaseList(); +#T35_ReadDatabase2(); +#T36_ReadIndex2(); +#T07_ReadSchemaIncludeList(); +#T08_ReadAllowList(); +#T21_ReadTLS(); +# +#T37_CheckCommonServerCertificate(); +#T38_ConfigureCommonServerCertificate(); +#T21_ReadTLS(); +# +#T39_ReadSLPEnabled(); +#T40_WriteSLPEnabled(); + -- 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] r49725 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: rhafer Date: Tue Aug 5 16:24:04 2008 New Revision: 49725 URL: http://svn.opensuse.org/viewcvs/yast?rev=49725&view=rev Log: Fixed some typos Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Tue Aug 5 16:24:04 2008 @@ -22,12 +22,14 @@ use X500::DN; use ycp; use YaST::YCP; +use YaPI; our %TYPEINFO; YaST::YCP::Import ("Progress"); YaST::YCP::Import ("SuSEFirewall"); YaST::YCP::Import ("Service"); +YaST::YCP::Import ("SCR"); my %error = ( msg => undef, details => undef ); my $usingDefaults = 1; @@ -142,13 +144,14 @@ BEGIN { $TYPEINFO{Read} = ["function", "boolean"]; } sub Read { y2milestone(""); - SuSEFirewall->Read(); + my $progressItems = [ "Reading Startup Configuration", "Reading Configuration Backend", "Reading Configuration Data" ]; - Progress->New("Initializing LDAP Server Configuration", "Blub", 3, $progressItems, $progressItems, ""); + Progress->New("Initializing LDAP Server Configuration", " ", 3, $progressItems, $progressItems, ""); Progress->NextStage(); + my $serviceInfo = Service->FullInfo("ldap"); y2milestone("Serviceinfo: ". Data::Dumper->Dump([$serviceInfo])); my $isRunning = ( defined $serviceInfo->{"started"}) && ($serviceInfo->{"started"} == 0); # 0 == "running" @@ -221,7 +224,7 @@ $slapdConfChanged = 1; } - y2milestone("ConfigModifed: " . $slapdConfChanged); + y2milestone("ConfigModified: " . $slapdConfChanged); } Progress->Finish(); @@ -1109,8 +1112,8 @@ $ppolicy->{'useLockout'} = YaST::YCP::Boolean($ppolicy->{'useLockout'}); # slapo-ppolicy requires ppolicy schema to be loaded - my @schema = $self->GetSchemaList(); - if ( grep( !/^ppolicy$/, @schema ) ) + my $schema = $self->GetSchemaList(); + if ( ! grep( /^ppolicy$/, @{$schema} ) ) { my $rc = $self->AddSchemaToSchemaList("/etc/openldap/schema/ppolicy.schema"); if ( ! $rc ) -- 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] r49724 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: rhafer Date: Tue Aug 5 16:24:00 2008 New Revision: 49724 URL: http://svn.opensuse.org/viewcvs/yast?rev=49724&view=rev Log: removed lint Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Tue Aug 5 16:24:00 2008 @@ -911,14 +911,6 @@ map<string, string> err = LdapServer::GetError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; } -// list<any> pp_overlay = [ "ppolicy", ppolicy ]; -// list<any> overlays = [ pp_overlay ]; -// db = add( db, "overlay", overlays); -// list<string> inclist = LdapServer::ReadSchemaIncludeList(); -// if(! contains( inclist, "/etc/openldap/schema/ppolicy.schema" ) ){ -// inclist = add(inclist, "/etc/openldap/schema/ppolicy.schema" ); -// LdapServer::WriteSchemaIncludeList(inclist); -// } } else { map<string,any> ppolicy_map = LdapServer::GetPpolicyOverlay(index); if ( size(ppolicy_map) == 0 ) @@ -933,21 +925,6 @@ map<string, string> err = LdapServer::GetError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; } - -// map<string,string> ppolicy_map = LdapServer::GetPasswordPolicyOverlay(suffix); -// if ( ppolicy_map != nil ){ -// list<any> newoverlay = []; -// list<any> empty_pp_ol = ["ppolicy", nil ]; -// integer i = 0; -// foreach( list<any> i, db["overlay"]:[], { -// if ((string)i[0]:"" != "ppolicy") { -// newoverlay = add(newoverlay, i); -// } else { -// newoverlay = add(newoverlay, empty_pp_ol); -// } -// }); -// db["overlay"] = newoverlay; -// } } } return result; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49723 - /trunk/ldap-server/configure.in.in
by rhafer＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: rhafer Date: Tue Aug 5 16:23:57 2008 New Revision: 49723 URL: http://svn.opensuse.org/viewcvs/yast?rev=49723&view=rev Log: fixed typo Modified: trunk/ldap-server/configure.in.in Modified: trunk/ldap-server/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/configure.in.in?rev=… ============================================================================== --- trunk/ldap-server/configure.in.in (original) +++ trunk/ldap-server/configure.in.in Tue Aug 5 16:23:57 2008 @@ -11,10 +11,10 @@ @YAST2-CHECKS-YCP@ AC_LANG_PUSH(C++) -yast_found_ldappplib=no +yast_found_ldapcpplib=no AC_CHECK_HEADER(LDAPSchema.h,[yast_found_ldapcpplib=yes]) if [[ "$yast_found_ldapcpplib" = "no" ]]; then - AC_MSG_ERROR(Headers for ldapcpplib are missing. Please install the package ldapcpplib-devel.) + AC_MSG_ERROR(Headers for ldapcpplib are missing. Please install the package libldapcpp-devel.) fi yast_found_boost=no AC_CHECK_HEADER(boost/shared_ptr.hpp,[yast_found_boost=yes]) -- 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] r49722 - in /trunk/ldap-server/src/lib: slapd-config.cpp slapd-config.h
by rhafer＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: rhafer Date: Tue Aug 5 16:23:54 2008 New Revision: 49722 URL: http://svn.opensuse.org/viewcvs/yast?rev=49722&view=rev Log: re-read LDAP Entries from server after writing them Modified: trunk/ldap-server/src/lib/slapd-config.cpp trunk/ldap-server/src/lib/slapd-config.h Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Tue Aug 5 16:23:54 2008 @@ -457,6 +457,12 @@ return res; } +void OlcSchemaConfig::resetMemberAttrs() +{ + std::string name(this->getStringValue("cn")); + entryIndex = splitIndexFromString( name, m_name ); +} + OlcTlsSettings OlcGlobalConfig::getTlsSettings() const { log_it(0, "OlcTlsSettings OlcGlobalConfig::getTlsSettings() const "); @@ -468,35 +474,6 @@ tls.applySettings( *this ); } -//std::map<std::string, std::list<std::string> > OlcGlobalConfig::toMap() const -//{ -// std::map<std::string, std::list<std::string> > resMap; -// const LDAPAttribute *at = m_dbEntryChanged.getAttributeByName("olcsuffix"); -// if ( at ) -// { -// StringList values = at->getValues(); -// StringList::const_iterator j; -// std::list<std::string> valList; -// for ( j = values.begin(); j != values.end(); j++ ) -// { -// valList.push_back(*j); -// } -// resMap.insert(std::make_pair("suffix", valList)); -// } -// at = m_dbEntryChanged.getAttributeByName("olcDatabase"); -// if ( at ) -// { -// StringList values = at->getValues(); -// StringList::const_iterator j; -// std::list<std::string> valList; -// for ( j = values.begin(); j != values.end(); j++ ) -// { -// valList.push_back(*j); -// } -// resMap.insert(std::make_pair("type", valList)); -// } -// return resMap; -//} bool OlcConfigEntry::isDatabaseEntry ( const LDAPEntry& e ) { @@ -608,7 +585,14 @@ void OlcConfigEntry::clearChangedEntry() { - m_dbEntryChanged = LDAPEntry(); + m_dbEntryChanged = LDAPEntry(); +} + +void OlcConfigEntry::resetEntries( const LDAPEntry &e ) +{ + m_dbEntry = e; + m_dbEntryChanged = e; + this->resetMemberAttrs(); } OlcOverlay* OlcOverlay::createFromLdapEntry( const LDAPEntry& e) @@ -638,36 +622,11 @@ return m_type; } - -//std::map<std::string, std::list<std::string> > OlcDatabase::toMap() const -//{ -// std::map<std::string, std::list<std::string> > resMap; -// const LDAPAttribute *at = m_dbEntryChanged.getAttributeByName("olcsuffix"); -// if ( at ) -// { -// StringList values = at->getValues(); -// StringList::const_iterator j; -// std::list<std::string> valList; -// for ( j = values.begin(); j != values.end(); j++ ) -// { -// valList.push_back(*j); -// } -// resMap.insert(std::make_pair("suffix", valList)); -// } -// at = m_dbEntryChanged.getAttributeByName("olcDatabase"); -// if ( at ) -// { -// StringList values = at->getValues(); -// StringList::const_iterator j; -// std::list<std::string> valList; -// for ( j = values.begin(); j != values.end(); j++ ) -// { -// valList.push_back(*j); -// } -// resMap.insert(std::make_pair("type", valList)); -// } -// return resMap; -//} +void OlcOverlay::resetMemberAttrs() +{ + std::string type(this->getStringValue("olcoverlay")); + entryIndex = splitIndexFromString( type, m_type ); +} void OlcDatabase::setSuffix( const std::string &suffix) { @@ -704,25 +663,11 @@ return m_overlays; } -//std::map<std::string, std::list<std::string> > OlcBdbDatabase::toMap() const -//{ -// std::map<std::string, std::list<std::string> > resMap = -// OlcDatabase::toMap(); -// -// const LDAPAttribute *at = m_dbEntryChanged.getAttributeByName("olcDbNoSync"); -// if ( at ) -// { -// StringList values = at->getValues(); -// StringList::const_iterator j; -// std::list<std::string> valList; -// for ( j = values.begin(); j != values.end(); j++ ) -// { -// valList.push_back(*j); -// } -// resMap.insert(std::make_pair("nosync", valList)); -// } -// return resMap; -//} +void OlcDatabase::resetMemberAttrs() +{ + std::string type(this->getStringValue("olcdatabase")); + entryIndex = splitIndexFromString( type, m_type ); +} bool OlcDatabase::isBdbDatabase( const LDAPEntry& e ) { @@ -938,7 +883,18 @@ OlcConfig::OlcConfig(LDAPConnection *lc) : m_lc(lc) { - +} + +bool OlcConfig::hasConnection() const +{ + if ( m_lc ) + { + return true; + } + else + { + return false; + } } boost::shared_ptr<OlcGlobalConfig> OlcConfig::getGlobals() @@ -972,9 +928,10 @@ } } -void OlcConfig::updateEntry( const OlcConfigEntry &oce ) +void OlcConfig::updateEntry( OlcConfigEntry &oce ) { try { + bool reread = true; if ( oce.isNewEntry () ) { m_lc->add(&oce.getChangedEntry()); @@ -986,7 +943,20 @@ m_lc->modify( oce.getDn(), &ml ); } else { log_it(0,oce.getDn() + ": no changes" ); + reread = false; + } + } + // re-read Entry from Server + if ( reread ) + { + LDAPSearchResults *sr = m_lc->search( oce.getDn(), LDAPConnection::SEARCH_BASE); + LDAPEntry *e = sr->getNext(); + if ( e ) { + log_it(0,"Re-read Entry " + e->getDN() ); + oce.resetEntries( *e ); + delete(e); } + delete(sr); } } catch (LDAPException e) { log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); Modified: trunk/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.h (original) +++ trunk/ldap-server/src/lib/slapd-config.h Tue Aug 5 16:23:54 2008 @@ -48,7 +48,9 @@ inline const LDAPEntry& getChangedEntry() const { return m_dbEntryChanged; } + virtual void clearChangedEntry(); + virtual void resetEntries( const LDAPEntry &le ); bool isNewEntry() const; bool isDeletedEntry() const; @@ -74,6 +76,7 @@ virtual std::string toLdif() const; protected: + virtual void resetMemberAttrs() {}; virtual void updateEntryDn(); int entryIndex; @@ -105,6 +108,7 @@ const std::string getType() const; protected: + virtual void resetMemberAttrs(); std::string m_type; }; @@ -132,6 +136,7 @@ OlcOverlayList& getOverlays() ; protected: + virtual void resetMemberAttrs(); virtual void updateEntryDn(); std::string m_type; OlcOverlayList m_overlays; @@ -194,6 +199,7 @@ const std::vector<LDAPAttrType> getAttributeTypes() const; private: + virtual void resetMemberAttrs(); std::string m_name; }; @@ -236,13 +242,14 @@ public: OlcConfig(LDAPConnection *lc=0 ); + bool hasConnection() const; boost::shared_ptr<OlcGlobalConfig> getGlobals(); OlcDatabaseList getDatabases(); OlcSchemaList getSchemaNames(); void setGlobals( OlcGlobalConfig &olcg); - void updateEntry( const OlcConfigEntry &oce ); + void updateEntry( OlcConfigEntry &oce ); static SlapdConfigLogCallback *logCallback; static void setLogCallback( SlapdConfigLogCallback *lcb ); -- 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] r49721 - /trunk/ldap-server/src/agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: rhafer Date: Tue Aug 5 16:23:51 2008 New Revision: 49721 URL: http://svn.opensuse.org/viewcvs/yast?rev=49721&view=rev Log: Open connection only if not already connected Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Tue Aug 5 16:23:51 2008 @@ -118,7 +118,7 @@ if ( path->component_str(0) == "global" ) { y2milestone("Global Write"); return WriteGlobal(path->at(1), arg, arg2); - } else if ( path->component_str(0) == "database" ) { + } else if ( (path->component_str(0) == "database") && (path->length() > 1) ) { y2milestone("Database Write"); return WriteDatabase(path->at(1), arg, arg2); } else if ( path->component_str(0) == "schema" ) { @@ -146,11 +146,26 @@ y2milestone("Execute Path %s", path->toString().c_str() ); if ( path->component_str(0) == "init" ) { - - LDAPConnection *lc = new LDAPConnection("ldapi:///"); - SaslExternalHandler sih; - lc->saslInteractiveBind("external", 2 /* LDAP_SASL_QUIET */, (SaslInteractionHandler*)&sih); - olc = OlcConfig(lc); + if ( ! olc.hasConnection() ) + { + LDAPConnection *lc = new LDAPConnection("ldapi:///"); + try { + SaslExternalHandler sih; + lc->saslInteractiveBind("external", 2 /* LDAP_SASL_QUIET */, (SaslInteractionHandler*)&sih); + } + catch ( LDAPException e) + { + std::string errstring = "Error connecting to LDAP Server"; + std::string details = e.getResultMsg() + ": " + e.getServerMsg(); + + lastError->add(YCPString("summary"), + YCPString(errstring) ); + lastError->add(YCPString("description"), YCPString( details ) ); + delete(lc); + return YCPBoolean(false); + } + olc = OlcConfig(lc); + } } if ( path->component_str(0) == "initFromLdif" ) { @@ -273,17 +288,17 @@ if ( globals ) olc.updateEntry( *globals ); - OlcSchemaList::const_iterator j; + OlcSchemaList::iterator j; for ( j = schema.begin(); j != schema.end() ; j++ ) { olc.updateEntry(**j); } - OlcDatabaseList::const_iterator i; + OlcDatabaseList::iterator i; for ( i = databases.begin(); i != databases.end() ; i++ ) { olc.updateEntry(**i); OlcOverlayList overlays = (*i)->getOverlays(); - OlcOverlayList::const_iterator k; + OlcOverlayList::iterator k; for ( k = overlays.begin(); k != overlays.end(); k++ ) { y2milestone("Update overlay: %s", (*k)->getDn().c_str() ); -- 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] r49720 - /trunk/ldap-server/src/dialogs.ycp
by rhafer＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: rhafer Date: Tue Aug 5 16:23:48 2008 New Revision: 49720 URL: http://svn.opensuse.org/viewcvs/yast?rev=49720&view=rev Log: The module itself doesn't use YaPI anymore Modified: trunk/ldap-server/src/dialogs.ycp Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Tue Aug 5 16:23:48 2008 @@ -19,7 +19,6 @@ import "DNS"; import "CaMgm"; import "Report"; -import "YaPI::LdapServer"; include "ldap-server/helps.ycp"; include "ldap-server/tree_structure.ycp"; -- 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] r49719 - /trunk/ncurses-pkg/src/NCPkgMenuExtras.cc
by kmachalkova＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kmachalkova Date: Tue Aug 5 16:22:12 2008 New Revision: 49719 URL: http://svn.opensuse.org/viewcvs/yast?rev=49719&view=rev Log: Show "Start repository manager" menu only when requested by `opt(`repoMgr) flag i.e. not in installation phase (#381956) Modified: trunk/ncurses-pkg/src/NCPkgMenuExtras.cc Modified: trunk/ncurses-pkg/src/NCPkgMenuExtras.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuExtras.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuExtras.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuExtras.cc Tue Aug 5 16:22:12 2008 @@ -59,8 +59,11 @@ diskSpace = new YMenuItem( _("&Show Available Disk Space") ); items.push_back( diskSpace ); - repoManager = new YMenuItem( _("S&tart Repository Manager")); - items.push_back( repoManager ); + if ( !pkg->isRepoMgrEnabled() ) + { + repoManager = new YMenuItem( _("S&tart Repository Manager")); + items.push_back( repoManager ); + } addItems( items ); } -- 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] r49718 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPackageSelectorStart.cc NCPackageSelectorStart.h
by kmachalkova＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: kmachalkova Date: Tue Aug 5 16:17:43 2008 New Revision: 49718 URL: http://svn.opensuse.org/viewcvs/yast?rev=49718&view=rev Log: Avoiding code duplication (pkg selector modes) This is all *cobe*-d up, NCPackageSelector should inherit from YPackageSelector, but it's so entirely entangled with the rest of the code that it is impossible Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPackageSelectorStart.cc trunk/ncurses-pkg/src/NCPackageSelectorStart.h Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Tue Aug 5 16:17:43 2008 @@ -77,18 +77,14 @@ // // Constructor // -NCPackageSelector::NCPackageSelector( YNCursesUI * ui, YWidget * wRoot, long modeFlags ) - : y2ui( ui ) - , filterPopup( 0 ) +NCPackageSelector::NCPackageSelector( long modeFlags ) + : filterPopup( 0 ) , depsPopup( 0 ) , patternPopup( 0 ) , languagePopup( 0 ) , repoPopup( 0 ) , diskspacePopup( 0 ) , searchPopup( 0 ) - , youMode( false ) - , updateMode( false ) - , testMode ( false ) , autoCheck( true ) , pkgList ( 0 ) , depsMenu( 0 ) @@ -111,16 +107,7 @@ , visibleInfo( 0 ) { - if ( modeFlags & YPkg_OnlineUpdateMode ) - youMode = true; - - if ( modeFlags & YPkg_UpdateMode ) - updateMode = true; - - // read test source information - if (modeFlags & YPkg_TestMode ) - testMode = true; - + setFlags( modeFlags ); saveState (); diskspacePopup = new NCPkgDiskspace( testMode ); @@ -138,6 +125,18 @@ // NCPackageSelectorPlugin::runPkgSelection } +void NCPackageSelector::setFlags( long modeFlags ) +{ + youMode = ( modeFlags & YPkg_OnlineUpdateMode ) ? true : false ; + + updateMode = ( modeFlags & YPkg_UpdateMode ) ? true : false ; + + repoMgrEnabled = (modeFlags & YPkg_RepoMgr) ? true : false; + + testMode = (modeFlags & YPkg_TestMode ) ? true : false ; + +} + bool NCPackageSelector::checkNow( bool *ok ) { bool ret = false; Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Tue Aug 5 16:17:43 2008 @@ -100,8 +100,6 @@ tHandlerMap eventHandlerMap; // event handler map - YNCursesUI * y2ui; // the UI - NCPkgFilterRPMGroups * filterPopup; // the rpm group tags popup NCPkgPopupDeps * depsPopup; // the package dependeny popup @@ -117,6 +115,7 @@ bool youMode; // YOU bool updateMode; // Update bool testMode; // testing + bool repoMgrEnabled; bool autoCheck; YRpmGroupsTree * _rpmGroupsTree; // rpm groups of the found packages @@ -181,13 +180,15 @@ * @param ui The NCurses UI * @param opt The widget options */ - NCPackageSelector( YNCursesUI * ui, YWidget * wRoot, long modeFlags ); + NCPackageSelector( long modeFlags ); /** * Destructor */ virtual ~NCPackageSelector(); + void setFlags( long modeFlags); + /** * Create layout for the PackageSelector * @param parent Parent is PackageSelectorStart @@ -266,6 +267,10 @@ bool isYouMode() { return youMode; } + bool isUpdateMode() { return updateMode; } + + bool isRepoMgrEnabled() { return repoMgrEnabled; } + bool isAutoCheck() { return autoCheck; } void AutoCheck( bool check) { autoCheck = check; } Modified: trunk/ncurses-pkg/src/NCPackageSelectorStart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorStart.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorStart.cc Tue Aug 5 16:17:43 2008 @@ -43,42 +43,31 @@ long modeFlags, YUIDimension dimension ) : NCLayoutBox( parent, dimension ) - , widgetRoot( 0 ) , packager( 0 ) - , youMode ( false ) - , updateMode ( false ) { - YNCursesUI * ui = YNCursesUI::ui(); - // set the textdomain setTextdomain( "ncurses-pkg" ); - // get the mode (the mode is also available in PackageSelector via modeFlags) - if ( modeFlags & YPkg_OnlineUpdateMode ) - youMode = true; - - if ( modeFlags & YPkg_UpdateMode ) - updateMode = true; - // NEW NEW - packager = new NCPackageSelector( ui, widgetRoot, modeFlags ); + packager = new NCPackageSelector( modeFlags ); NCPkgTable::NCPkgTableType type; - if ( youMode ) - type = NCPkgTable::T_Patches; - else if ( updateMode ) - type = NCPkgTable::T_Update; - else - type = NCPkgTable::T_Packages; - if ( packager ) { - yuiMilestone() << "YouMode: " << (youMode?"true":"false") << endl; - if ( !youMode ) - packager->createPkgLayout( this, type ); - else + if ( packager->isYouMode() ) + { packager->createYouLayout( this ); + type = NCPkgTable::T_Patches; + } + else + { + if ( packager->isUpdateMode() ) + type = NCPkgTable::T_Update; + else + type = NCPkgTable::T_Packages; + packager->createPkgLayout( this, type ); + } } yuiDebug() << endl; @@ -136,7 +125,7 @@ // fill package list with packages belonging to default RPM group packager->fillDefaultList(); - if ( youMode ) + if ( packager->isYouMode() ) { // show download size packager->showDownloadSize(); Modified: trunk/ncurses-pkg/src/NCPackageSelectorStart.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorStart.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorStart.h Tue Aug 5 16:17:43 2008 @@ -44,13 +44,8 @@ NCPackageSelectorStart ( const NCPackageSelectorStart & ); private: - - YWidget * widgetRoot; // root of the widget tree of the package selection dialog NCPackageSelector *packager; // packager object contains the data and handles events - - bool youMode; - bool updateMode; protected: @@ -97,12 +92,6 @@ * @return bool */ bool handleEvent( const NCursesEvent& event ); - - /** - * Returns the root of the widget tree. - */ - YWidget * root( ) const { return widgetRoot; }; - }; -- 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] r49717 - /trunk/storage/libstorage/src/StorageInterface.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 15:58:33 2008 New Revision: 49717 URL: http://svn.opensuse.org/viewcvs/yast?rev=49717&view=rev Log: - removed evms error codes Modified: trunk/storage/libstorage/src/StorageInterface.h 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 Aug 5 15:58:33 2008 @@ -474,10 +474,6 @@ STORAGE_MEMORY_EXHAUSTED = -2016, STORAGE_LOOP_NOT_FOUND = -2017, STORAGE_CREATED_LOOP_NOT_FOUND = -2018, - STORAGE_EVMS_INVALID_NAME = -2019, - STORAGE_EVMS_CO_EXISTS = -2020, - STORAGE_EVMS_CO_NOT_FOUND = -2021, - STORAGE_EVMS_INVALID_DEVICE = -2022, STORAGE_CHANGE_AREA_INVALID_CONTAINER = -2023, STORAGE_BACKUP_STATE_NOT_FOUND = -2024, STORAGE_INVALID_FSTAB_VALUE = -2025, @@ -595,53 +591,6 @@ LOOP_REMOVE_CREATE_NOT_FOUND = -7009, LOOP_MODIFY_EXISTING = -7010, - EVMS_HELPER_UNKNOWN_CMD = -8000, - EVMS_UNSUPPORTED_CONTAINER_TYPE = -8001, - EVMS_MALLOC_FAILED = -8002, - EVMS_INVALID_PHYSICAL_VOLUME = -8003, - EVMS_PHYSICAL_VOLUME_IN_USE = -8004, - EVMS_PLUGIN_NOT_FOUND = -8005, - EVMS_CREATE_CONTAINER_FAILED = -8006, - EVMS_RESIZE_VOLUME_NOT_FOUND = -8007, - EVMS_RESIZE_CONTAINER_NOT_FOUND = -8008, - EVMS_RESIZE_EXPAND_FAILED = -8009, - EVMS_RESIZE_SHRINK_FAILED = -8010, - EVMS_COMMIT_FAILED = -8011, - EVMS_CREATE_VOLUME_FREESPACE_NOT_FOUND = -8012, - EVMS_CREATE_VOLUME_FAILED = -8013, - EVMS_CREATE_COMPAT_VOLUME_FAILED = -8014, - EVMS_SEGMENT_NOT_FOUND = -8015, - EVMS_REMOVE_VOLUME_NOT_FOUND = -8016, - EVMS_REMOVE_REGION_FAILED = -8017, - EVMS_CONTAINER_NOT_FOUND = -8018, - EVMS_CONTAINER_EXPAND_FAILED = -8019, - EVMS_CONTAINER_SHRINK_INVALID_SEGMENT = -8020, - EVMS_CONTAINER_SHRINK_FAILED = -8021, - EVMS_CONTAINER_REMOVE_FAILED = -8022, - EVMS_PV_ALREADY_CONTAINED = -8023, - EVMS_PV_DEVICE_UNKNOWN = -8024, - EVMS_PV_DEVICE_USED = -8025, - EVMS_CO_HAS_NONE_PV = -8026, - EVMS_LV_INVALID_NAME = -8027, - EVMS_LV_DUPLICATE_NAME = -8028, - EVMS_LV_NO_SPACE = -8029, - EVMS_LV_UNKNOWN_NAME = -8030, - EVMS_LV_NOT_IN_LIST = -8031, - EVMS_PV_STILL_ADDED = -8032, - EVMS_PV_REMOVE_NOT_FOUND = -8033, - EVMS_CREATE_LV_INVALID_VOLUME = -8034, - EVMS_REMOVE_LV_INVALID_VOLUME = -8035, - EVMS_RESIZE_LV_INVALID_VOLUME = -8036, - EVMS_CHANGE_READONLY = -8037, - EVMS_CHECK_RESIZE_INVALID_VOLUME = -8038, - EVMS_COMMIT_NOTHING_TODO = -8039, - EVMS_LV_REMOVE_USED_BY = -8040, - EVMS_COMMUNICATION_FAILED = -8041, - EVMS_LV_ALREADY_ON_DISK = -8042, - EVMS_LV_NO_STRIPE_SIZE = -8043, - EVMS_ACTIVATE_FAILED = -8044, - EVMS_CONTAINER_NOT_CREATED = -8045, - PEC_PE_SIZE_INVALID = -9000, PEC_PV_NOT_FOUND = -9001, PEC_REMOVE_PV_IN_USE = -9002, -- 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] r49716 - /trunk/mail/src/mail-server_dialogs.ycp
by varkoly＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: varkoly Date: Tue Aug 5 15:52:20 2008 New Revision: 49716 URL: http://svn.opensuse.org/viewcvs/yast?rev=49716&view=rev Log: fix bad argument Modified: trunk/mail/src/mail-server_dialogs.ycp Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp… ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Tue Aug 5 15:52:20 2008 @@ -33,6 +33,7 @@ define any CheckLDAPDialog () { y2milestone("--Start CheckLDAPDialog ---"); + block<boolean> abort_block = ``{ return false; }; boolean ca_mgm = false; boolean conf_ldap_client = false; boolean setup_ldap_server = false; @@ -132,7 +133,7 @@ LDAPSettings [ "create_ldap" ] = true; Ldap::Import(LDAPSettings); //write the settings: - Ldap::Write(abort); + Ldap::Write(abort_block); } MailServer::AdminPassword = Ldap::LDAPAskAndBind(false); if( MailServer::AdminPassword != 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] r49715 - in /trunk/storage: libstorage/examples/ libstorage/src/ storage/src/modules/
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 15:50:38 2008 New Revision: 49715 URL: http://svn.opensuse.org/viewcvs/yast?rev=49715&view=rev Log: - more evms removal Removed: trunk/storage/libstorage/src/Evms.cc trunk/storage/libstorage/src/Evms.h trunk/storage/libstorage/src/EvmsCo.cc trunk/storage/libstorage/src/EvmsCo.h Modified: trunk/storage/libstorage/examples/TestStorage.cc trunk/storage/libstorage/src/Makefile.am trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageInterface.h trunk/storage/storage/src/modules/Storage.ycp 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 Aug 5 15:50:38 2008 @@ -27,16 +27,10 @@ struct PVG1 { bool operator()(const LvmVg&d) const {return(d.numPv()>1);}}; struct LVG1 { bool operator()(const LvmVg&d) const {return(d.numLv()>1);}}; struct NoLv { bool operator()(const LvmVg&d) const {return(d.numLv()==0);}}; -struct PVG1E { bool operator()(const EvmsCo&d) const {return(d.numPv()>1);}}; -struct LVG1E { bool operator()(const EvmsCo&d) const {return(d.numVol()>1);}}; -struct NoLvE { bool operator()(const EvmsCo&d) const {return(d.numVol()==0);}}; struct StripeG1 { bool operator()(const LvmLv&d) const {return(d.stripes()>1);}}; -struct StripeG1E { bool operator()(const Evms&d) const {return(d.stripes()>1);}}; struct TestHaveA { bool operator()(const LvmLv&d) const { return( d.name().find( "a" )!=string::npos); }}; -struct TestHaveAE { bool operator()(const Evms&d) const - { return( d.name().find( "a" )!=string::npos); }}; template <class C> bool TestIsA( const C& d ) { return( d.name().find( "a" )!=string::npos); }; @@ -45,7 +39,6 @@ template <class C> bool TestFalse( const C& d ) { return( false ); }; template <class C> bool TestTrue( const C& d ) { return( true ); }; bool TestLvG1( const LvmVg& d ) { return( d.numLv()>1 ); }; -bool TestVolG1( const EvmsCo& d ) { return( d.numVol()>1 ); }; template <class pair> void PrintPair( ostream& s, const pair& p, const string& txt ) @@ -60,7 +53,7 @@ int main( int argc_iv, char** argv_ppcv ) - { +{ Storage::initDefaultLogger(); Storage Sto( true, false, true ); for( Storage::ConstContIterator i=Sto.contBegin(); i!=Sto.contEnd(); ++i ) @@ -354,60 +347,4 @@ Storage::LvmLvCondIPair<TestHaveA>::type p = Sto.lvmLvCondPair<TestHaveA>( TestHaveA() ); PrintPair<Storage::LvmLvCondIPair<TestHaveA>::type>( cout, p, "LvmLv 'a' " ); } - { - Storage::ConstEvmsCoPair p = Sto.evmsCoPair(); - PrintPair<Storage::ConstEvmsCoPair>( cout, p, "Evms " ); - struct tmp { - static bool TestPvGt1( const EvmsCo& d ) - { return( d.numPv()>1 ); }; - static bool TestLvGt1( const EvmsCo& d ) - { return( d.numVol()>1 ); }; - static bool TestEmpty( const EvmsCo& d ) - { return( d.numVol()==0 ); }; - }; - p = Sto.evmsCoPair(tmp::TestPvGt1); - PrintPair<Storage::ConstEvmsCoPair>( cout, p, "Evms PV>1 " ); - p = Sto.evmsCoPair(tmp::TestLvGt1); - PrintPair<Storage::ConstEvmsCoPair>( cout, p, "Evms LV>1 " ); - p = Sto.evmsCoPair(tmp::TestEmpty); - PrintPair<Storage::ConstEvmsCoPair>( cout, p, "Evms No LV " ); - } - { - Storage::EvmsCoCondIPair<PVG1E>::type p = Sto.evmsCoCondPair<PVG1E>( PVG1E() ); - PrintPair<Storage::EvmsCoCondIPair<PVG1E>::type>( cout, p, "Evms PV>1 " ); - } - { - Storage::EvmsCoCondIPair<LVG1E>::type p = Sto.evmsCoCondPair<LVG1E>( LVG1E() ); - PrintPair<Storage::EvmsCoCondIPair<LVG1E>::type>( cout, p, "Evms LV>1 " ); - } - { - Storage::EvmsCoCondIPair<NoLvE>::type p = Sto.evmsCoCondPair<NoLvE>( NoLvE() ); - PrintPair<Storage::EvmsCoCondIPair<NoLvE>::type>( cout, p, "Evms LV==0 " ); - } - { - Storage::ConstEvmsPair p = Sto.evmsPair(); - PrintPair<Storage::ConstEvmsPair>( cout, p, "EvmsVol " ); - struct tmp { - static bool TestNameA( const Evms& d ) - { return( d.name().find("a")!=string::npos ); }; - static bool TestStripeG1( const Evms& d ) - { return( d.stripes()>1 ); }; - }; - p = Sto.evmsPair(tmp::TestNameA); - PrintPair<Storage::ConstEvmsPair>( cout, p, "EvmsVol 'a' " ); - p = Sto.evmsPair(tmp::TestStripeG1); - PrintPair<Storage::ConstEvmsPair>( cout, p, "EvmsVol S>1 " ); - p = Sto.evmsPair( tmp::TestNameA, TestVolG1 ); - PrintPair<Storage::ConstEvmsPair>( cout, p, "EvmsVol 'a' LV>1 " ); - p = Sto.evmsPair( TestFalse<Evms>, TestTrue<EvmsCo> ); - PrintPair<Storage::ConstEvmsPair>( cout, p, "EvmsVol impossible " ); - } - { - Storage::EvmsCondIPair<StripeG1E>::type p = Sto.evmsCondPair<StripeG1E>( StripeG1E() ); - PrintPair<Storage::EvmsCondIPair<StripeG1E>::type>( cout, p, "EvmsVol S>1 " ); - } - { - Storage::EvmsCondIPair<TestHaveAE>::type p = Sto.evmsCondPair<TestHaveAE>( TestHaveAE() ); - PrintPair<Storage::EvmsCondIPair<TestHaveAE>::type>( cout, p, "EvmsVol 'a' " ); - } - } +} 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 Aug 5 15:50:38 2008 @@ -29,7 +29,6 @@ Dasd.cc Dasd.h \ PeContainer.cc PeContainer.h \ LvmVg.cc LvmVg.h \ - EvmsCo.cc EvmsCo.h \ DmPartCo.cc DmPartCo.h \ DmraidCo.cc DmraidCo.h \ DmCo.cc DmCo.h \ @@ -40,7 +39,6 @@ Partition.cc Partition.h \ Dm.cc Dm.h \ LvmLv.cc LvmLv.h \ - Evms.cc Evms.h \ DmPart.cc DmPart.h \ Dmraid.cc Dmraid.h \ Md.cc Md.h \ 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 Aug 5 15:50:38 2008 @@ -14,8 +14,6 @@ #include "y2storage/Partition.h" #include "y2storage/LvmVg.h" #include "y2storage/LvmLv.h" -#include "y2storage/EvmsCo.h" -#include "y2storage/Evms.h" #include "y2storage/DmraidCo.h" #include "y2storage/Dmraid.h" #include "y2storage/MdCo.h" @@ -737,88 +735,6 @@ return( LvmVgIterator( LvmVgPIterator( p, CheckFnc, true )) ); } -// iterators over EVMS container - protected: - // protected typedefs for iterators over EVMS container - typedef CastCheckIterator<CCIter, storage::EVMS, const EvmsCo *> ContainerCEvmsIter; - template< class Pred > - struct ConstEvmsCoPI { typedef ContainerIter<Pred, ContainerCEvmsIter> type; }; - typedef CastCheckIterator<CIter, storage::EVMS, EvmsCo *> ContainerEvmsIter; - template< class Pred > - struct EvmsCoPI { typedef ContainerIter<Pred, ContainerEvmsIter> type; }; - template< class Pred > - struct EvmsCoI { typedef ContainerDerIter<Pred, typename EvmsCoPI<Pred>::type, EvmsCo> type; }; - typedef CheckFnc<const EvmsCo> CheckFncEvmsCo; - typedef CheckerIterator< CheckFncEvmsCo, ConstEvmsCoPI<CheckFncEvmsCo>::type, - ContainerCEvmsIter, EvmsCo > ConstEvmsCoPIterator; - typedef CheckerIterator< CheckFncEvmsCo, EvmsCoPI<CheckFncEvmsCo>::type, - ContainerEvmsIter, EvmsCo > EvmsCoPIterator; - typedef DerefIterator<EvmsCoPIterator,EvmsCo> EvmsCoIterator; - typedef IterPair<EvmsCoIterator> EvmsCoPair; - - public: - // public typedefs for iterators over EVMS container - typedef DerefIterator<ConstEvmsCoPIterator,const EvmsCo> ConstEvmsCoIterator; - template< class Pred > - struct ConstEvmsCoI - { typedef ContainerDerIter<Pred, typename ConstEvmsCoPI<Pred>::type, - const EvmsCo> type; }; - template< class Pred > - struct EvmsCoCondIPair { typedef MakeCondIterPair<Pred, typename ConstEvmsCoI<Pred>::type> type; }; - typedef IterPair<ConstEvmsCoIterator> ConstEvmsCoPair; - - // public member functions for iterators over EVMS container - ConstEvmsCoPair evmsCoPair( bool (* CheckFnc)( const EvmsCo& )=NULL ) const - { - return( ConstEvmsCoPair( evmsCoBegin( CheckFnc ), evmsCoEnd( CheckFnc ) )); - } - ConstEvmsCoIterator evmsCoBegin( bool (* CheckFnc)( const EvmsCo& )=NULL ) const - { - IterPair<ContainerCEvmsIter> p( ContainerCEvmsIter( cont.begin(), cont.end() ), - ContainerCEvmsIter( cont.begin(), cont.end(), true )); - return( ConstEvmsCoIterator( ConstEvmsCoPIterator( p, CheckFnc )) ); - } - ConstEvmsCoIterator evmsCoEnd( bool (* CheckFnc)( const EvmsCo& )=NULL ) const - { - IterPair<ContainerCEvmsIter> p( ContainerCEvmsIter( cont.begin(), cont.end() ), - ContainerCEvmsIter( cont.begin(), cont.end(), true )); - return( ConstEvmsCoIterator( ConstEvmsCoPIterator( p, CheckFnc, true )) ); - } - template< class Pred > typename EvmsCoCondIPair<Pred>::type evmsCoCondPair( const Pred& p ) const - { - return( typename EvmsCoCondIPair<Pred>::type( evmsCoCondBegin( p ), evmsCoCondEnd( p ) ) ); - } - template< class Pred > typename ConstEvmsCoI<Pred>::type evmsCoCondBegin( const Pred& p ) const - { - IterPair<ContainerCEvmsIter> pair( ContainerCEvmsIter( cont.begin(), cont.end() ), - ContainerCEvmsIter( cont.begin(), cont.end(), true )); - return( typename ConstEvmsCoI<Pred>::type( typename ConstEvmsCoPI<Pred>::type( pair, p )) ); - } - template< class Pred > typename ConstEvmsCoI<Pred>::type evmsCoCondEnd( const Pred& p ) const - { - IterPair<ContainerCEvmsIter> pair( ContainerCEvmsIter( cont.begin(), cont.end() ), - ContainerCEvmsIter( cont.begin(), cont.end(), true )); - return( typename ConstEvmsCoI<Pred>::type( typename ConstEvmsCoPI<Pred>::type( pair, p, true )) ); - } - protected: - // protected member functions for iterators over EVMS container - EvmsCoPair evCoPair( bool (* CheckFnc)( const EvmsCo& )=NULL ) - { - return( EvmsCoPair( evCoBegin( CheckFnc ), evCoEnd( CheckFnc ) )); - } - EvmsCoIterator evCoBegin( bool (* CheckFnc)( const EvmsCo& )=NULL ) - { - IterPair<ContainerEvmsIter> p( ContainerEvmsIter( cont.begin(), cont.end() ), - ContainerEvmsIter( cont.begin(), cont.end(), true )); - return( EvmsCoIterator( EvmsCoPIterator( p, CheckFnc )) ); - } - EvmsCoIterator evCoEnd( bool (* CheckFnc)( const EvmsCo& )=NULL ) - { - IterPair<ContainerEvmsIter> p( ContainerEvmsIter( cont.begin(), cont.end() ), - ContainerEvmsIter( cont.begin(), cont.end(), true )); - return( EvmsCoIterator( EvmsCoPIterator( p, CheckFnc, true )) ); - } - // iterators over DmPart container protected: // protected typedefs for iterators over DmPart container @@ -1238,78 +1154,6 @@ return( typename ConstLvmLvI<Pred>::type( typename ConstLvmLvPI<Pred>::type(pair, p, true )) ); } -// iterators over EVMS volumes - protected: - // protected typedefs for iterators over EVMS volumes - typedef ListListIterator<Container::ConstPlainIterator, ConstEvmsCoIterator> ConstEvmsInter; - typedef CastIterator<ConstEvmsInter, Evms *> ConstEvmsInter2; - template< class Pred > - struct ConstEvmsPI { typedef ContainerIter<Pred, ConstEvmsInter2> type; }; - typedef CheckFnc<const Evms> CheckFncEvms; - typedef CheckerIterator< CheckFncEvms, ConstEvmsPI<CheckFncEvms>::type, - ConstEvmsInter2, Evms > ConstEvmsPIterator; - public: - // public typedefs for iterators over EVMS volumes - template< class Pred > - struct ConstEvmsI - { typedef ContainerDerIter<Pred, typename ConstEvmsPI<Pred>::type, - const Evms> type; }; - template< class Pred > - struct EvmsCondIPair - { typedef MakeCondIterPair<Pred, typename ConstEvmsI<Pred>::type> type;}; - typedef DerefIterator<ConstEvmsPIterator, const Evms> ConstEvmsIterator; - typedef IterPair<ConstEvmsIterator> ConstEvmsPair; - - // public member functions for iterators over EVMS volumes - ConstEvmsPair evmsPair( bool (* CheckEvmsCo)( const EvmsCo& )) const - { - return( ConstEvmsPair( evmsBegin( CheckEvmsCo ), evmsEnd( CheckEvmsCo ) )); - } - ConstEvmsPair evmsPair( bool (* CheckEvms)( const Evms& )=NULL, - bool (* CheckEvmsCo)( const EvmsCo& )=NULL) const - { - return( ConstEvmsPair( evmsBegin( CheckEvms, CheckEvmsCo ), - evmsEnd( CheckEvms, CheckEvmsCo ) )); - } - ConstEvmsIterator evmsBegin( bool (* CheckEvmsCo)( const EvmsCo& )) const - { - return( evmsBegin( NULL, CheckEvmsCo ) ); - } - ConstEvmsIterator evmsBegin( bool (* CheckEvms)( const Evms& )=NULL, - bool (* CheckEvmsCo)( const EvmsCo& )=NULL) const - { - IterPair<ConstEvmsInter2> p( (ConstEvmsInter(evmsCoPair( CheckEvmsCo ))), - (ConstEvmsInter(evmsCoPair( CheckEvmsCo ), true ))); - return( ConstEvmsIterator( ConstEvmsPIterator(p, CheckEvms ))); - } - ConstEvmsIterator evmsEnd( bool (* CheckEvmsCo)( const EvmsCo& )) const - { - return( evmsEnd( NULL, CheckEvmsCo ) ); - } - ConstEvmsIterator evmsEnd( bool (* CheckEvms)( const Evms& )=NULL, - bool (* CheckEvmsCo)( const EvmsCo& )=NULL) const - { - IterPair<ConstEvmsInter2> p( (ConstEvmsInter(evmsCoPair( CheckEvmsCo ))), - (ConstEvmsInter(evmsCoPair( CheckEvmsCo ), true ))); - return( ConstEvmsIterator( ConstEvmsPIterator(p, CheckEvms, true ))); - } - template< class Pred > typename EvmsCondIPair<Pred>::type evmsCondPair( const Pred& p ) const - { - return( typename EvmsCondIPair<Pred>::type( evmsCondBegin( p ), evmsCondEnd( p ) ) ); - } - template< class Pred > typename ConstEvmsI<Pred>::type evmsCondBegin( const Pred& p ) const - { - IterPair<ConstEvmsInter2> pair( (ConstEvmsInter( evmsCoPair())), - (ConstEvmsInter( evmsCoPair(), true ))); - return( typename ConstEvmsI<Pred>::type( typename ConstEvmsPI<Pred>::type(pair, p) ) ); - } - template< class Pred > typename ConstEvmsI<Pred>::type evmsCondEnd( const Pred& p ) const - { - IterPair<ConstEvmsInter2> pair( (ConstEvmsInter( evmsCoPair())), - (ConstEvmsInter( evmsCoPair(), true ))); - return( typename ConstEvmsI<Pred>::type( typename ConstEvmsPI<Pred>::type(pair, p, true )) ); - } - // iterators over software raid devices protected: // protected typedefs for iterators over software raid devices 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 Aug 5 15:50:38 2008 @@ -112,7 +112,7 @@ enum MdParity { PAR_NONE, LEFT_ASYMMETRIC, LEFT_SYMMETRIC, RIGHT_ASYMMETRIC, RIGHT_SYMMETRIC }; - enum UsedByType { UB_NONE, UB_LVM, UB_MD, UB_EVMS, UB_DM, UB_DMRAID }; + enum UsedByType { UB_NONE, UB_LVM, UB_MD, UB_DM, UB_DMRAID }; enum CType { CUNKNOWN, DISK, MD, LOOP, LVM, DM, EVMS, DMRAID, NFSC, COTYPE_LAST_ENTRY }; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Aug 5 15:50:38 2008 @@ -84,7 +84,6 @@ "def_int" : LibStorage::UB_NONE(), "m" : $[ LibStorage::UB_LVM() : `UB_LVM, LibStorage::UB_MD() : `UB_MD, - LibStorage::UB_EVMS() : `UB_EVMS, LibStorage::UB_DMRAID() : `UB_DMRAID, LibStorage::UB_DM() : `UB_DM ] -- 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] r49714 - /tags/stable-2_17_4/pkg-bindings/
by lslezak＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: lslezak Date: Tue Aug 5 15:26:09 2008 New Revision: 49714 URL: http://svn.opensuse.org/viewcvs/yast?rev=49714&view=rev Log: Created tag stable-2_17_4 for pkg-bindings Added: tags/stable-2_17_4/pkg-bindings/ - copied from r49713, trunk/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49713 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/ProvideProcess.cc
by lslezak＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: lslezak Date: Tue Aug 5 15:26:02 2008 New Revision: 49713 URL: http://svn.opensuse.org/viewcvs/yast?rev=49713&view=rev Log: - fixed searching for the candidate package - prefer better architecture to better version (bnc#413150) - 2.17.4 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/ProvideProcess.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=49713&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Tue Aug 5 15:26:02 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Aug 5 15:26:02 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 5 14:55:43 CEST 2008 - lslezak(a)suse.cz + +- fixed searching for the candidate package - prefer better + architecture to better version (bnc#413150) +- 2.17.4 + +------------------------------------------------------------------- Wed Jul 30 11:52:01 CEST 2008 - lslezak(a)suse.cz - Pkg::Connect() - set LastError() (bnc#280537) Modified: trunk/pkg-bindings/src/ProvideProcess.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/ProvideProcess.… ============================================================================== --- trunk/pkg-bindings/src/ProvideProcess.cc (original) +++ trunk/pkg-bindings/src/ProvideProcess.cc Tue Aug 5 15:26:02 2008 @@ -65,18 +65,24 @@ provider.status().resetTransact(whoWantsIt); } + // get the provider arch + zypp::Arch provider_arch(provider->arch()); + // regarding items which are installable only - if (!provider->arch().compatibleWith( _architecture )) { - y2milestone ("provider %s has incompatible arch '%s'", provider->name().c_str(), provider->arch().asString().c_str()); + if (!provider_arch.compatibleWith( _architecture )) { + y2milestone ("provider %s has incompatible arch '%s'", provider->name().c_str(), provider_arch.asString().c_str()); } else if (!item) { // no provider yet item = provider; } - else if (item->arch().compare( provider->arch() ) < 0) { // provider has better arch + else if (item->arch().compare( provider_arch ) < 0) { // provider has better arch item = provider; } - else if (item->edition().compare( provider->edition() ) < 0) { - item = provider; // provider has better edition + // provider has better edition, but doesn't have worse architecture (item has better or same) + else if (item->edition().compare( provider->edition() ) < 0 + && item->arch().compare( provider_arch ) <= 0) + { + item = provider; } } -- 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] r49712 - /trunk/storage/libstorage/src/Storage.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 15:23:49 2008 New Revision: 49712 URL: http://svn.opensuse.org/viewcvs/yast?rev=49712&view=rev Log: - fixed comment Modified: trunk/storage/libstorage/src/Storage.h 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 Aug 5 15:23:49 2008 @@ -1561,7 +1561,7 @@ typedef CheckerIterator< CheckFncDmraid, ConstDmraidPI<CheckFncDmraid>::type, ConstDmraidInter2, Dmraid > ConstDmraidPIterator; public: - // public typedefs for iterators over EVMS volumes + // public typedefs for iterators over dmraid volumes template< class Pred > struct ConstDmraidI { typedef ContainerDerIter<Pred, typename ConstDmraidPI<Pred>::type, @@ -1572,7 +1572,7 @@ typedef DerefIterator<ConstDmraidPIterator, const Dmraid> ConstDmraidIterator; typedef IterPair<ConstDmraidIterator> ConstDmraidPair; - // public member functions for iterators over EVMS volumes + // public member functions for iterators over dmraid volumes ConstDmraidPair dmrPair( bool (* CheckDmraidCo)( const DmraidCo& )) const { return( ConstDmraidPair( dmrBegin( CheckDmraidCo ), dmrEnd( CheckDmraidCo ) )); -- 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] r49711 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 15:16:15 2008 New Revision: 49711 URL: http://svn.opensuse.org/viewcvs/yast?rev=49711&view=rev Log: - removed more evms handling Modified: trunk/storage/libstorage/src/Storage.cc 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 Aug 5 15:16:15 2008 @@ -3714,14 +3714,13 @@ bool Storage::removeDmMapsTo( const string& dev ) { - bool also_evms = false; bool ret = false; - y2milestone( "dev:%s also_evms:%d", dev.c_str(), also_evms ); + y2mil("dev:" << dev); VPair vp = vPair( isDmContainer ); for( VolIterator v=vp.begin(); v!=vp.end(); ++v ) { Dm * dm = dynamic_cast<Dm *>(&(*v)); - if( (also_evms||v->getUsedByType()!=UB_EVMS) && dm!=NULL ) + if (dm != NULL) { y2mil( "dm:" << *dm ); if( dm->mapsTo( dev ) ) @@ -3735,7 +3734,7 @@ ret = true; } } - else if( dm==NULL ) + else y2warning( "not a Dm descendant %s", v->device().c_str() ); } VolIterator v; -- 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] r49710 - in /trunk/storage/libstorage/src: Dm.cc DmCo.cc Storage.cc Storage.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 15:12:53 2008 New Revision: 49710 URL: http://svn.opensuse.org/viewcvs/yast?rev=49710&view=rev Log: - removed more evms code Modified: trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h 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 Aug 5 15:12:53 2008 @@ -220,13 +220,6 @@ } while( ret.empty() && mj==dm_major && c.retcode()==0 ); } - if( ret.find( "/dev/evms/" )==0 ) - { - string tmp( ret ); - tmp.erase( 5, 5 ); - if( cont->getStorage()->knownDevice( tmp, true ) ) - ret = tmp; - } return( ret ); } 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 Aug 5 15:12:53 2008 @@ -109,7 +109,6 @@ void DmCo::getDmData( ProcPart& ppart ) { - Storage::ConstEvmsPair ev = getStorage()->evmsPair(); Storage::ConstLvmLvPair lv = getStorage()->lvmLvPair(); Storage::ConstDmraidCoPair dmrco = getStorage()->dmraidCoPair(); Storage::ConstDmraidPair dmr = getStorage()->dmrPair(); @@ -128,15 +127,6 @@ } if( !found ) { - Storage::ConstEvmsIterator i=ev.begin(); - while( !found && i!=ev.end() ) - { - found = i->getTableName()==table; - ++i; - } - } - if( !found ) - { Storage::ConstDmraidCoIterator i=dmrco.begin(); while( !found && i!=dmrco.end() ) { 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 Aug 5 15:12:53 2008 @@ -228,15 +228,6 @@ void Storage::detectObjects() { ProcPart* ppart = new ProcPart; - if( EvmsCo::canDoEvms() ) - { - const char * file = "/etc/evms.conf"; - if( access( file, R_OK )==0 ) - { - SystemCmd cmd( (string)"grep exclude " + file ); - } - EvmsCo::activate(true); - } detectDisks( *ppart ); if( instsys() ) { @@ -276,9 +267,6 @@ detectNfs( pm ); detectFsData( vBegin(), vEnd(), pm ); } - EvmsCoIterator e = findEvmsCo( "" ); - if( e!=evCoEnd() ) - e->updateMd(); if( instsys() ) { @@ -3924,13 +3912,6 @@ info.numeric = true; info.nr = p.second; } - else if( dev.find("/dev/evms/")==0 ) - { - info.type = EVMS; - info.numeric = false; - info.vname = dev.substr( dev.find_last_of('/')+1 ); - info.cname = dev.substr( 0, dev.find_last_of('/') ); - } else if( dev.find("/dev/disk/by-uuid/")==0 || dev.find("/dev/disk/by-label/")==0 || dev.find("UUID=")==0 || dev.find("LABEL=")==0 ) @@ -4762,24 +4743,6 @@ return( ret ); } -Storage::EvmsCoIterator Storage::findEvmsCo( const string& name ) - { - assertInit(); - EvmsCoPair p = evCoPair(); - EvmsCoIterator ret=p.begin(); - string name1 = name; - string name2 = name; - if( !name.empty() && name.find( "lvm/" )!=0 && name.find( "lvm2/" )!=0 ) - { - name1 = "lvm/" + name1; - name2 = "lvm2/" + name2; - } - while( ret != p.end() && - (ret->deleted() || (ret->name()!=name1 && ret->name()!=name2)) ) - ++ret; - return( ret ); - } - Storage::DmraidCoIterator Storage::findDmraidCo( const string& name ) { assertInit(); @@ -5514,7 +5477,6 @@ MdCo::activate(val,tmpDir()); } LvmVg::activate(val); - EvmsCo::activate(val); if( !val ) { Dm::activate(val); 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 Aug 5 15:12:53 2008 @@ -1651,7 +1651,6 @@ DiskIterator findDiskId( const string& id ); DiskIterator findDiskPath( const string& path ); LvmVgIterator findLvmVg( const string& name ); - EvmsCoIterator findEvmsCo( const string& name ); DmraidCoIterator findDmraidCo( const string& name ); DmPartCoIterator findDmPartCo( const string& name ); bool findVolume( const string& device, ContIterator& c, -- 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] r49709 - in /trunk/storage/libstorage/src: Storage.cc Storage.h
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 14:52:54 2008 New Revision: 49709 URL: http://svn.opensuse.org/viewcvs/yast?rev=49709&view=rev Log: - more evms removal Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h 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 Aug 5 14:52:54 2008 @@ -1040,10 +1040,6 @@ else { ret = i->createPartition( type, start, size, device, true ); - if( ret==0 && haveEvms() ) - { - handleEvmsCreateDevice( disk, device, type==EXTENDED ); - } } } } @@ -1058,12 +1054,6 @@ else { ret = i->createPartition( type, start, size, device, true ); - /* - if( ret==0 && haveEvms() ) - { - handleEvmsCreateDevice( disk, device, type==EXTENDED ); - } - */ } } } @@ -1111,10 +1101,6 @@ tmp_start = 0; unsigned long start_cyl = i->kbToCylinder( tmp_start )+1; ret = i->createPartition( type, start_cyl, num_cyl, device, true ); - if( ret==0 && haveEvms() ) - { - handleEvmsCreateDevice( disk, device, type==EXTENDED ); - } } } } @@ -1136,12 +1122,6 @@ tmp_start = 0; unsigned long start_cyl = i->kbToCylinder( tmp_start )+1; ret = i->createPartition( type, start_cyl, num_cyl, device, true ); - /* - if( ret==0 && haveEvms() ) - { - handleEvmsCreateDevice( disk, device, type==EXTENDED ); - } - */ } } } @@ -1177,10 +1157,6 @@ { unsigned long num_cyl = i->kbToCylinder( sizeK ); ret = i->createPartition( num_cyl, device, true ); - if( ret==0 && haveEvms() ) - { - handleEvmsCreateDevice( disk, device ); - } } } } @@ -1196,12 +1172,6 @@ { unsigned long num_cyl = i->kbToCylinder( sizeK ); ret = i->createPartition( num_cyl, device, true ); - /* - if( ret==0 && haveEvms() ) - { - handleEvmsCreateDevice( disk, device ); - } - */ } } } @@ -1268,10 +1238,6 @@ else { ret = i->createPartition( type, device ); - if( ret==0 && haveEvms() ) - { - handleEvmsCreateDevice( disk, device ); - } } } } @@ -1286,12 +1252,6 @@ else { ret = i->createPartition( type, device ); - /* - if( ret==0 && haveEvms() ) - { - handleEvmsCreateDevice( disk, device ); - } - */ } } } @@ -1378,10 +1338,6 @@ { if( vol->getUsedByType() != UB_NONE ) ret = removeUsing( vol->device(), vol->getUsedBy() ); - if( ret==0 && haveEvms() ) - { - handleEvmsRemoveDevice( disk, vol->device(), false ); - } if( ret==0 ) ret = disk->removePartition( vol->nr() ); } @@ -1402,12 +1358,6 @@ { if( vol->getUsedByType() != UB_NONE ) ret = removeUsing( vol->device(), vol->getUsedBy() ); - /* - if( ret==0 && haveEvms() ) - { - handleEvmsRemoveDevice( disk, vol->device(), false ); - } - */ if( ret==0 ) ret = disk->removePartition( vol->nr() ); } @@ -2511,18 +2461,6 @@ string vdev = vol->device(); if( vol->getUsedByType() != UB_NONE ) ret = removeUsing( vdev, vol->getUsedBy() ); - if( ret==0 && cont->type()==DISK && haveEvms() ) - { - Disk* disk = dynamic_cast<Disk *>(&(*cont)); - y2mil( "disk:" << disk ); - string tmp = vdev; - string::size_type pos = tmp.find_last_not_of( "0123456789" ); - tmp.erase( 0, pos+1 ); - unsigned num = 0; - if( !tmp.empty() ) - tmp >> num; - handleEvmsRemoveDevice( disk, vdev, false ); - } if( ret==0 ) ret = cont->removeVolume( &(*vol) ); } @@ -2604,22 +2542,6 @@ ret = i->removeVg(); if( ret==0 && i->created() ) ret = removeContainer( &(*i) ); - if( ret==0 && haveEvms() ) - { - string evn = (string)"lvm2/" + name; - EvmsCoIterator e = findEvmsCo( evn ); - y2mil( "n1:" << evn << " found:" << (e!=evCoEnd()) ); - if( e==evCoEnd() ) - { - evn = (string)"lvm/" + name; - e = findEvmsCo( evn ); - y2mil( "n2:" << evn << " found:" << (e!=evCoEnd()) ); - } - if( e!=evCoEnd() ) - { - removeContainer( &(*e) ); - } - } } else { @@ -3726,7 +3648,6 @@ y2milestone( "p.length:%d", p.length() ); CommitStage a[] = { DECREASE, INCREASE, FORMAT, MOUNT }; CommitStage* pt = a; - bool evms_activate = false; while( unsigned(pt-a) < lengthof(a) ) { bool new_pair = false; @@ -3753,25 +3674,9 @@ CType type = (*ac)->type; Container *co = cont ? const_cast<Container*>((*ac)->co()) : const_cast<Container*>((*ac)->vol()->getContainer()); - if( !evms_activate && *pt==INCREASE && - (type==DISK||type==MD||(cont&&type==EVMS)) ) - { - evms_activate = true; - } - if( !evms_activate && *pt==DECREASE && - (type==LVM||type==DISK||type==MD) ) - { - evms_activate = true; - } - if( evms_activate && haveEvms() && - ((*pt==INCREASE && type==EVMS)||*pt==FORMAT||*pt==MOUNT)) - { - // evmsActivateDevices(); - evms_activate = false; - } if( cont ) { - bool cont_removed = co->deleted() && (type==LVM||type==EVMS); + bool cont_removed = co->deleted() && type==LVM; ret = co->commitChanges( *pt ); cont_removed = cont_removed && ret==0; if( cont_removed ) @@ -3793,8 +3698,7 @@ delete( *ac ); ++ac; } - y2milestone( "stage:%d evms_activate:%d new_pair:%d", *pt, - evms_activate, new_pair ); + y2milestone( "stage:%d new_pair:%d", *pt, new_pair ); if( new_pair ) { p = cPair( fnc ); @@ -3810,12 +3714,6 @@ logProcData(); } } - if( evms_activate && haveEvms() ) - { - // evmsActivateDevices(); - evms_activate = false; - logProcData(); - } y2milestone( "ret:%d", ret ); return( ret ); } @@ -4448,143 +4346,6 @@ } } -static bool isEvmsContainer( const Container& c ) - { return( c.type()==EVMS && !c.name().empty() ); } - -bool Storage::haveEvms() - { - bool ret = false; - ContIterator c; - if( findContainer( "/dev/evms", c ) && !c->isEmpty() ) - ret = true; - if( !ret ) - { - CPair cp = cPair( isEvmsContainer ); - y2mil( "num EVMS cont:" << cp.length() ); - ret = !cp.empty(); - } - y2milestone( "ret:%d", ret ); - return( ret ); - } - -void Storage::handleEvmsRemoveDevice( const Disk* disk, const string& d, - bool rename ) - { - y2mil( "device:" << d << " rename:" << rename ); - ContIterator c; - if( findContainer( "/dev/evms", c )) - { - VolIterator v; - if( findVolume( d, v, true ) ) - { - Partition* p = dynamic_cast<Partition *>(&(*v)); - if( p && p->type()==EXTENDED ) - { - string dname = p->disk()->name(); - DiskIterator d = findDisk( dname ); - if( d!=dEnd() ) - { - Disk::PartPair dp = d->partPair(); - Disk::PartIter pi = dp.begin(); - while( pi!=dp.end() ) - { - if( pi->type()==LOGICAL ) - { - //string dev = "/dev/evms/" + pi->name(); - string dev = EvmsCo::devToEvms( pi->device() ); - y2mil( "evms new dev:" << dev ); - VolIterator vv; - if( findVolume( dev, vv )) - { - vv->setDeleted(); - vv->setSilent(); - } - } - ++pi; - } - } - } - } - string dev = EvmsCo::devToEvms( d ); - y2mil( "evmsdev:" << dev ); - if( findVolume( dev, v )) - { - v->setDeleted(); - v->setSilent(); - y2mil( "v:" << *v ); - } - if( disk->isEmpty() && disk->device().find("/dev/dasd")!=0 && - !findVolume( EvmsCo::devToEvms(disk->device()), v) ) - { - EvmsCo* co = dynamic_cast<EvmsCo *>(&(*c)); - if( co != NULL ) - { - string name = EvmsCo::devToEvms(disk->device()); - y2mil( "evmsdev:" << dev ); - co->addLv( disk->sizeK(), name.substr(10), false ); - } - } - if( rename ) - { - string tmp( dev ); - string::size_type pos = tmp.find_last_not_of( "0123456789" ); - tmp.erase( 0, pos+1 ); - y2mil( "tmp:" << tmp << " pos:" << pos ); - unsigned num = 0; - if( !tmp.empty() ) - tmp >> num; - num++; - dev.erase( pos+1 ); - while( findVolume( dev+decString(num), v )) - { - string tmp = dev+decString(num-1); - y2mil( "bef rename:" << *v ); - v->rename( tmp.substr( dev.rfind( '/' )+1 )); - y2mil( "aft rename:" << *v ); - num++; - } - } - logCo( &(*c) ); - } - } - - -void Storage::handleEvmsCreateDevice( const string& disk, const string& d, bool extended ) - { - y2mil( "disk:" << disk << " device:" << d << " ext:" << extended ); - ContIterator c; - if( findContainer( "/dev/evms", c ) && c->type()==EVMS ) - { - VolIterator v; - VolIterator w; - string dev; - if( !extended ) - { - dev = EvmsCo::devToEvms(d); - if( findVolume( d, v ) && !findVolume( dev, w )) - { - EvmsCo* co = dynamic_cast<EvmsCo *>(&(*c)); - if( co != NULL ) - { - Evms* l = new Evms( *co, dev.substr(10), v->sizeK(), 1u ); - co->addVolume( l ); - y2mil( "l:" << *l ); - if( findVolume( dev, w )) - y2mil( "w:" << *w ); - } - } - logCo( &(*c) ); - } - dev = EvmsCo::devToEvms( disk ); - if( findVolume( dev, v )) - { - v->setDeleted(); - v->setSilent(); - y2mil( "del evms disk:" << *v ); - logCo( &(*c) ); - } - } - } void Storage::removeDmTableTo( const Volume& vol ) { 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 Aug 5 14:52:54 2008 @@ -1663,12 +1663,6 @@ bool haveMd( MdCo*& md ); bool haveNfs( NfsCo*& co ); bool haveLoop( LoopCo*& loop ); - bool haveEvms(); - void handleEvmsRemoveDevice( const Disk* disk, const string& d, - bool rename ); - void handleEvmsCreateDevice( const string& disk, const string& dev, - bool extended=false ); - int removeContainer( Container* val, bool call_del=true ); void logVolumes( const string& Dir ); int commitPair( CPair& p, bool (* fnc)( const Container& ) ); -- 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] r49708 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 05 Aug '08

05 Aug '08

Author: aschnell Date: Tue Aug 5 14:36:19 2008 New Revision: 49708 URL: http://svn.opensuse.org/viewcvs/yast?rev=49708&view=rev Log: - more evms removal Modified: trunk/storage/libstorage/src/Storage.cc 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 Aug 5 14:36:19 2008 @@ -3549,7 +3549,7 @@ { if( rhs->cType()==lhs->cType() ) { - if( rhs->cType()==LVM||rhs->cType()==EVMS ) + if( rhs->cType()==LVM ) return( static_cast<const Dm*>(rhs)->stripes() > static_cast<const Dm*>(lhs)->stripes() ); else @@ -3823,8 +3823,7 @@ static bool isDmContainer( const Container& co ) { - return( co.type()==EVMS || co.type()==DM || co.type()==LVM || - co.type()==DMRAID ); + return co.type()==DM || co.type()==LVM || co.type()==DMRAID; } bool Storage::removeDmMapsTo( const string& dev ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0