February 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r45105 - /branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes
by fehr＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: fehr Date: Thu Feb 28 17:04:59 2008 New Revision: 45105 URL: http://svn.opensuse.org/viewcvs/yast?rev=45105&view=rev Log: fix dates in changelog Modified: branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/storage/package/yast2-storage.changes Thu Feb 28 17:04:59 2008 @@ -800,7 +800,7 @@ - prevent wrong default mount point for swap in LVM LV (#156669) ------------------------------------------------------------------- -Thu Mar 9 16:20:12 MST 2006 - cgao(a)novell.com +Thu Mar 11 16:20:12 MST 2006 - cgao(a)novell.com - Stopped adding "deleted" win partitions (#153646+#153714) - Initialized fs in Volume::getFsData() (#155470) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45104 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_lib.ycp
by fehr＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: fehr Date: Thu Feb 28 17:02:02 2008 New Revision: 45104 URL: http://svn.opensuse.org/viewcvs/yast?rev=45104&view=rev Log: do not allow mp swap for file based loop devices (#363332) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp 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 Thu Feb 28 17:02:02 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 28 17:01:31 CET 2008 - fehr(a)suse.de + +- do not allow mp swap for file based loop devices (#363332) + +------------------------------------------------------------------- Mon Feb 25 17:40:54 CET 2008 - fehr(a)suse.de - ignore EVMS containers with erroneous devices (#360075) Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Thu Feb 28 17:02:02 2008 @@ -372,13 +372,15 @@ ``{ string mount = part["mount"]:""; symbol used_fs = part["used_fs"]:`unknown; + y2milestone( "check_mount_point part:%1", part ); boolean allowed = true; list not_allowed_system_mount_points = [ "/proc", "/dev", "/mnt", "/var/adm/mnt", "/lost+found", "/lib", "/bin", "/etc", "/sbin" ]; - if ( mount != "" && mount != "swap" ) + if( mount != "" && + (mount != "swap" || part["type"]:`unknown==`loop) ) { // check if the mount point is already in use foreach( string disk, map diskinfo, targetMap, ``{ @@ -391,7 +393,7 @@ }); }); - if( allowed == false ) + if( allowed == false && mount!="swap" ) { // error popup text Popup::Error(_("This mount point is already in use. Select a different one.")); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45103 - /tags/branch-SLE-10-SP2-2_13_100/storage/
by fehr＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: fehr Date: Thu Feb 28 17:00:02 2008 New Revision: 45103 URL: http://svn.opensuse.org/viewcvs/yast?rev=45103&view=rev Log: Created tag branch-SLE-10-SP2-2_13_100 for storage Added: tags/branch-SLE-10-SP2-2_13_100/storage/ - copied from r45102, branches/SuSE-SLE-10-SP2-Branch/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] r45102 - /trunk/gtk/src/YGUtils.cc
by rpmcruz＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: rpmcruz Date: Thu Feb 28 15:25:41 2008 New Revision: 45102 URL: http://svn.opensuse.org/viewcvs/yast?rev=45102&view=rev Log: A couple more stock icons. Modified: trunk/gtk/src/YGUtils.cc Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=45102&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Thu Feb 28 15:25:41 2008 @@ -459,11 +459,14 @@ {"Delete", GTK_STOCK_DELETE }, {"Down", GTK_STOCK_GO_DOWN }, {"Edit", GTK_STOCK_EDIT }, + {"Finish", GTK_STOCK_APPLY }, {"Launch", GTK_STOCK_EXECUTE }, {"Next", GTK_STOCK_GO_FORWARD }, {"No", GTK_STOCK_NO }, {"OK", GTK_STOCK_OK }, {"Quit", GTK_STOCK_QUIT }, + {"Reset", GTK_STOCK_REVERT_TO_SAVED }, + {"Reset all", GTK_STOCK_REVERT_TO_SAVED }, {"Retry", GTK_STOCK_REFRESH }, {"Search", GTK_STOCK_FIND }, {"Up", GTK_STOCK_GO_UP }, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45101 - /trunk/gtk/src/YGLayout.cc
by rpmcruz＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: rpmcruz Date: Thu Feb 28 13:21:53 2008 New Revision: 45101 URL: http://svn.opensuse.org/viewcvs/yast?rev=45101&view=rev Log: Debug description no longer needed there as widgetType() is already complete. Modified: trunk/gtk/src/YGLayout.cc Modified: trunk/gtk/src/YGLayout.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGLayout.cc?rev=45101&r1… ============================================================================== --- trunk/gtk/src/YGLayout.cc (original) +++ trunk/gtk/src/YGLayout.cc Thu Feb 28 13:21:53 2008 @@ -38,11 +38,8 @@ YGWIDGET_IMPL_CHILD_ADDED (getWidget()) YGWIDGET_IMPL_CHILD_REMOVED (getWidget()) - virtual string getDebugLabel() const - { return primary() == YD_HORIZ ? "horizontal" : "vertical"; } virtual void moveChild (YWidget *child, int x, int y) {} - void addSizeGroup (YGLabeledWidget *labeledWidget) { GtkWidget *label = labeledWidget->getLabelWidget(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45100 - in /branches/tmp/bubli/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h
by kmachalkova＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: kmachalkova Date: Thu Feb 28 12:42:26 2008 New Revision: 45100 URL: http://svn.opensuse.org/viewcvs/yast?rev=45100&view=rev Log: moved Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc Thu Feb 28 12:42:26 2008 @@ -43,9 +43,8 @@ #include "YApplication.h" #include "NCi18n.h" -#include <boost/bind.hpp> -#include <fstream> -#include <iomanip> +//#include <fstream> +//#include <iomanip> #include <list> #include <string> #include <set> @@ -53,7 +52,6 @@ #include "NCZypp.h" // tryCastToZyppPkg(), tryCastToZyppPatch() #include <zypp/ui/Selectable.h> #include <zypp/ui/PatchContents.h> -#include <zypp/SysContent.h> #include "YWidgetID.h" //#include "YCPDialogParser.h" @@ -63,15 +61,11 @@ typedef zypp::ui::PatchContents ZyppPatchContents; typedef zypp::ui::PatchContents::const_iterator ZyppPatchContentsIterator; -typedef zypp::syscontent::Reader::Entry ZyppReaderEntry; -typedef std::pair<string, ZyppReaderEntry> importMapPair; #include <ycp/Parser.h> #include "YCP_UI.h" // FIXME: Get rid of this when ReplaceWidget() is no longer done with YCP #include "YEvent.h" -#define DEFAULT_EXPORT_FILE_NAME "user-packages.xml" - using namespace std; using std::string; using std::wstring; @@ -151,11 +145,8 @@ , patchpkgsItem( 0 ) , pkgversionsItem( 0 ) , etcMenu( 0 ) - , allpksItem( 0 ) - , exportItem( 0 ) - , importItem( 0 ) , testcaseItem( 0 ) - , filterLabel( 0 ) + , packageLabel( 0 ) , diskspaceLabel( 0 ) , infoText( 0 ) , replacePoint( 0 ) @@ -540,12 +531,6 @@ retVal = depsMenu->handleEvent( event ); else if ( event.widget == extrasMenu ) retVal = extrasMenu->handleEvent( event ); - else if ( event.widget == etcMenu ) - { - if ( (event.selection == exportItem) || (event.selection == importItem) ) - // import/export file list - retVal = FileHandler( event ); - } else if ( event.selection->label().substr(0,4) == "pkg:" ) // handle hyper links retVal = LinkHandler( event.selection->label() ); @@ -692,9 +677,9 @@ // NCDBG << "Filter: " << label << endl; // // show the selected filter label - // if ( filterLabel ) + // if ( packageLabel ) // { - // filterLabel->setLabel( label ); + // packageLabel->setLabel( label ); // } //} @@ -784,9 +769,9 @@ packageList->drawList(); // set filter label to 'Search' - if ( filterLabel ) + if ( packageLabel ) { - filterLabel->setText( NCPkgNames::SearchResults() ); + packageLabel->setText( NCPkgNames::SearchResults() ); } return true; @@ -832,9 +817,9 @@ packageList->drawList(); // set filter label to 'Search' - if ( filterLabel ) + if ( packageLabel ) { - filterLabel->setLabel( NCPkgNames::SearchResults() ); + packageLabel->setLabel( NCPkgNames::SearchResults() ); } return true; @@ -886,20 +871,20 @@ packageList->drawList(); // show the selected filter label - if ( filterLabel ) + if ( packageLabel ) { if ( filter == "installable" ) { // show common label "Online Update Patches" - filterLabel->setLabel( NCPkgNames::YOUPatches() ); + packageLabel->setLabel( NCPkgNames::YOUPatches() ); } else if ( filter == "installed" ) { - filterLabel->setLabel( NCPkgNames::InstPatches() ); + packageLabel->setLabel( NCPkgNames::InstPatches() ); } else { - filterLabel->setLabel( NCPkgNames::Patches() ); + packageLabel->setLabel( NCPkgNames::Patches() ); } } @@ -951,9 +936,9 @@ packageList->drawList(); // show the selected filter label - if ( filterLabel ) + if ( packageLabel ) { - filterLabel->setLabel( NCPkgNames::UpdateProblem() ); + packageLabel->setLabel( NCPkgNames::UpdateProblem() ); } return true; @@ -1131,9 +1116,9 @@ packageList->drawList(); // show the selected filter label - if ( filterLabel ) + if ( packageLabel ) { - filterLabel->setLabel( NCPkgNames::InstSummary() ); + packageLabel->setLabel( NCPkgNames::InstSummary() ); } return true; @@ -1202,9 +1187,9 @@ if ( ! label.empty() ) { // show the selected filter label - if ( filterLabel ) + if ( packageLabel ) { - filterLabel->setText( label ); + packageLabel->setText( label ); } } @@ -1277,12 +1262,12 @@ //and show the whole stuff to the user pkgList->drawList(); - if ( repoPopup && filterLabel ) + if ( repoPopup && packageLabel ) { ZyppProduct product = repoPopup->findProductForRepo( repo ); if ( product ) { - filterLabel->setLabel( product->summary() ); + packageLabel->setLabel( product->summary() ); } } @@ -1459,78 +1444,6 @@ return displayPatch; } -void NCPackageSelector::importSelectable( ZyppSel selectable, bool isWanted, const char* kind ) -{ - ZyppStatus oldStatus = selectable->status(); - ZyppStatus newStatus = oldStatus; - - //Package/Pattern is on the list - if (isWanted) - { - switch (oldStatus) - { - //Keep status for installed ones - case S_Install: - case S_AutoInstall: - case S_Update: - case S_AutoUpdate: - case S_KeepInstalled: - case S_Protected: - newStatus = oldStatus; - break; - - //Keep also those marked for deletion - case S_Del: - case S_AutoDel: - newStatus = S_KeepInstalled; - NCDBG << "Keeping " << kind << " " << selectable->name().c_str() << endl; - break; - - //Add not yet installed pkgs (if they have candidate available) - case S_NoInst: - case S_Taboo: - if ( selectable->hasCandidateObj() ) - { - newStatus = S_Install; - NCDBG << "Adding " << kind << " " << selectable->name().c_str() << endl; - } - else - { - NCDBG << "Cannot add " << kind << " " << selectable->name().c_str() << - " " << " - no candidate." << endl; - } - break; - } - } - //Package/Pattern is not on the list - else - { - switch (oldStatus) - { - //Mark installed ones for deletion - case S_Install: - case S_AutoInstall: - case S_Update: - case S_AutoUpdate: - case S_KeepInstalled: - case S_Protected: - newStatus = S_Del; - NCDBG << "Deleting " << kind << " " << selectable->name().c_str() << endl; - break; - - //Keep status for not installed, taboo and to-be-deleted - case S_Del: - case S_AutoDel: - case S_NoInst: - case S_Taboo: - newStatus = oldStatus; - break; - } - } - - if (oldStatus != newStatus) - selectable->set_status( newStatus ); -} /////////////////////////////////////////////////////////////////// // @@ -1873,158 +1786,6 @@ /////////////////////////////////////////////////////////////////// // -// File handler -// -// export/import all packages and patterns list to/from file -// -bool NCPackageSelector::FileHandler( const NCursesEvent& event ) -{ - if ( !event.selection ) - { - return false; - } - - //Export package list into file - if ( event.selection == exportItem ) - { - //Ask for file to save into - string filename = YUI::app()->askForSaveFileName( DEFAULT_EXPORT_FILE_NAME, - "*.xml", - _("Export List of All Packages and Patterns to File" )); - - if ( ! filename.empty() ) - { - zypp::syscontent::Writer writer; - const zypp::ResPool & pool = zypp::getZYpp()->pool(); - - //some strange C++ magic (c) by ma - for_each( pool.begin(), pool.end(), - boost::bind( &zypp::syscontent::Writer::addIf, - boost::ref(writer), - _1)); - - try - { - //open file for writing and try to dump syscontent into it - std::ofstream exportFile( filename.c_str() ); - exportFile.exceptions(std::ios_base::badbit | std::ios_base::failbit ); - exportFile << writer; - - NCMIL << "Exported list of packages and patterns to " << filename << endl; - } - - catch (std::exception & exception) - { - NCWAR << "Error exporting list of packages and patterns to " << filename << endl; - - //delete partially written file (don't care if it doesn't exist) - (void) unlink( filename.c_str() ); - - //present error popup to the user - NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ), - NCPkgNames::ErrorLabel(), - _("Error exporting list of packages and patterns to ") - // FIXME: String addition is evil for translators! - + filename, - NCPkgNames::OKLabel(), - ""); - errorMsg->setNiceSize(40,5); - NCursesEvent input = errorMsg->showInfoPopup(); - - YDialog::deleteTopmostDialog(); - } - - return true; - } - } - - //Import package list from file - else if ( event.selection == importItem ) - { - //ask for file to open - string filename = YUI::app()->askForExistingFile( DEFAULT_EXPORT_FILE_NAME, - "*.xml", - _("Import List of All Packages and Patterns from File")); - - if ( ! filename.empty() ) - { - NCPkgTable * packageList = PackageList(); - NCMIL << "Importing list of packages and patterns from " << filename << endl; - - try - { - std::ifstream importFile ( filename.c_str() ); - zypp::syscontent::Reader reader (importFile); - - //maps to store package/pattern data into - map<string, ZyppReaderEntry> importPkgs; - map<string, ZyppReaderEntry> importPatterns; - - //Import syscontent reader to a map $[ "package_name" : pointer_to_data] - for (zypp::syscontent::Reader::const_iterator it = reader.begin(); - it != reader.end(); - it ++ ) - { - string kind = it->kind(); - - // importMapPair => std::pair<string, ZyppReaderEntry> - if ( kind == "package" ) - importPkgs.insert( importMapPair( it->name(), *it ) ); - else if ( kind == "pattern" ) - importPatterns.insert( importMapPair( it->name(), *it ) ); - } - - NCMIL << "Found " << importPkgs.size() << " packages and " << importPatterns.size() << " patterns." << endl; - - //Change status of appropriate packages and patterns - for (ZyppPoolIterator it = zyppPkgBegin(); - it != zyppPkgEnd(); - it++ ) - { - ZyppSel selectable = *it; - //isWanted => package name found in importPkgs map - importSelectable ( *it, importPkgs.find( selectable->name() ) != importPkgs.end(), "package" ); - } - - for (ZyppPoolIterator it = zyppPatternsBegin(); - it != zyppPatternsEnd(); - it++ ) - { - ZyppSel selectable = *it; - importSelectable ( *it, importPatterns.find( selectable->name() ) != importPatterns.end(), "pattern" ); - } - - //Switch to installation summary filter - fillSummaryList(NCPkgTable::L_Changes); - - //... and finally display the result - packageList->showInformation(); - packageList->setKeyboardFocus(); - - return true; - } - catch ( const zypp::Exception & exception ) - { - NCWAR << "Error importing list of packages and patterns from" << filename << endl; - - NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2) , - NCPkgNames::ErrorLabel(), - _("Error importing list of packages and patterns from ") - // FIXME: String addition is evil for translators! - + filename, - NCPkgNames::OKLabel(), - ""); - errorMsg->setNiceSize(40,5); - NCursesEvent input = errorMsg->showInfoPopup(); - - YDialog::deleteTopmostDialog(); - } - } - } - return true; -} -/////////////////////////////////////////////////////////////////// -// // HelpHandler // // Show the help popup @@ -3012,7 +2773,7 @@ // label text - keep it short new NCLabel( hSplit2, _( "Package: " ) ); - filterLabel = YUI::widgetFactory()->createLabel ( hSplit2, "......................" ); + packageLabel = YUI::widgetFactory()->createLabel ( hSplit2, "......................" ); new NCSpacing( hSplit2, YD_HORIZ, true, 0.5 ); @@ -3045,33 +2806,6 @@ } -void NCPackageSelector::createEtcMenu( ) -{ - // menu item of the Etc. menu - package dependency check - depsItem = new YMenuItem( _( "&Dependencies" ) ); - // menu items of the Etc./Dependencies submenu - showdepsItem = new YMenuItem( depsItem, _( " &Check Dependencies Now" ) ); - if ( autoCheck ) - // menu entry: dependency check off - autodepsItem = new YMenuItem( depsItem, _( "[X] &Automatic Dependency Check" ) ); - else - // menu entry: dependency check on - noautodepsItem = new YMenuItem( depsItem, _( "[ ] &Automatic Dependency Check" ) ); - - verifyItem = new YMenuItem( depsItem, _( " &Verify System" ) ); - // menu item - list of all packages in the system - allpksItem = new YMenuItem( _("All &Packages List" ) ); - exportItem = new YMenuItem( allpksItem, _("&Export to File") ); - importItem = new YMenuItem( allpksItem, _("&Import from File") ); - testcaseItem = new YMenuItem( _( "Generate Dependency Resolver &Test Case" ) ); - - YItemCollection itemCollection4; - itemCollection4.push_back( depsItem ); - itemCollection4.push_back( allpksItem ); - itemCollection4.push_back( testcaseItem ); - etcMenu->addItems( itemCollection4 ); -} - // // Fill package list with packages of default RPM group/update list or installable patches // Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h Thu Feb 28 12:42:26 2008 @@ -153,13 +153,11 @@ YMenuItem * noautodepsItem; YMenuItem * verifyItem; YMenuItem * allpksItem; - YMenuItem * exportItem; - YMenuItem * importItem ; YMenuItem * testcaseItem; // labels - YLabel * filterLabel; + YLabel * packageLabel; YLabel * diskspaceLabel; // information about packages @@ -220,7 +218,6 @@ * @return void */ void createPkgLayout( YWidget * parent, NCPkgTable::NCPkgTableType type ); - void createEtcMenu(); /** * Create layout for the Online Update @@ -232,7 +229,9 @@ // returns the package table widget NCPkgTable * PackageList(); - NCPkgPopupDeps *DepsPopup() {return depsPopup; } + NCPkgPopupDeps *DepsPopup() { return depsPopup; } + NCPkgPopupDiskspace *diskSpacePopup() { return diskspacePopup; } + YLabel *PackageLabel() { return packageLabel; } bool checkNow( bool *ok ) { return depsPopup->showDependencies( NCPkgPopupDeps::S_Solve, ok ); } @@ -350,12 +349,6 @@ bool InformationHandler ( const NCursesEvent& event ); /** - * Export/Import list of all packages and patterns to/from file - * - */ - bool FileHandler ( const NCursesEvent& event ); - - /** * Handler function for "OK button pressed" * @param event The Ncurses event * @return bool @@ -458,18 +451,7 @@ **/ bool checkPatch( ZyppPatch patch, ZyppSel selectable, string filter ); - /** - * Set status of a selectable according to its presence - * in the list imported from xml file (zypp::syscontent::Reader) - * - * @param selectable a selectable - * @param isWanted should be installed or not - * @param kind "package" or "pattern" - * @return void - **/ - void importSelectable ( ZyppSel selectable, bool isWanted, const char* kind ); - - /** + /** * Returns whether automatic dependency is on or off * @return bool */ @@ -497,7 +479,6 @@ */ bool match( string s1, string s2, bool ignoreCase ); - NCPkgPopupDiskspace *diskSpacePopup() { return diskspacePopup; } /** * Calls the package mananager (updateDu()) and shows the required disk space */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45099 - in /branches/tmp/bubli/ncurses-pkg/src: NCPkgMenuExtras.cc NCPkgMenuExtras.h
by kmachalkova＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: kmachalkova Date: Thu Feb 28 12:10:38 2008 New Revision: 45099 URL: http://svn.opensuse.org/viewcvs/yast?rev=45099&view=rev Log: export/import files moved here Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuExtras.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuExtras.h Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuExtras.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuExtras.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuExtras.cc Thu Feb 28 12:10:38 2008 @@ -18,6 +18,15 @@ #include "Y2Log.h" #include "NCPkgMenuExtras.h" +#include <boost/bind.hpp> +#include <fstream> +#include <iomanip> +#include <zypp/SysContent.h> + +typedef zypp::syscontent::Reader::Entry ZyppReaderEntry; +typedef std::pair<string, ZyppReaderEntry> importMapPair; + +#define DEFAULT_EXPORT_FILE_NAME "user-packages.xml" /* Textdomain "packages" @@ -54,13 +63,228 @@ if (!event.selection) return false; - if ( event.selection == diskSpace ) + if ( event.selection == exportFile ) + exportToFile(); + else if ( event.selection == importFile ) + importFromFile(); + else if ( event.selection == diskSpace ) showDiskSpace(); else NCINT << "zatim nic" << endl; return true; } +void NCPkgMenuExtras::importSelectable( ZyppSel selectable, bool isWanted, const char*kind ) +{ + ZyppStatus oldStatus = selectable->status(); + ZyppStatus newStatus = oldStatus; + + //Package/Pattern is on the list + if (isWanted) + { + switch (oldStatus) + { + //Keep status for installed ones + case S_Install: + case S_AutoInstall: + case S_Update: + case S_AutoUpdate: + case S_KeepInstalled: + case S_Protected: + newStatus = oldStatus; + break; + + //Keep also those marked for deletion + case S_Del: + case S_AutoDel: + newStatus = S_KeepInstalled; + NCDBG << "Keeping " << kind << " " << selectable->name().c_str() << endl; + break; + + //Add not yet installed pkgs (if they have candidate available) + case S_NoInst: + case S_Taboo: + if ( selectable->hasCandidateObj() ) + { + newStatus = S_Install; + NCDBG << "Adding " << kind << " " << selectable->name().c_str() << endl; + } + else + { + NCDBG << "Cannot add " << kind << " " << selectable->name().c_str() << + " " << " - no candidate." << endl; + } + break; + } + } + //Package/Pattern is not on the list + else + { + switch (oldStatus) + { + //Mark installed ones for deletion + case S_Install: + case S_AutoInstall: + case S_Update: + case S_AutoUpdate: + case S_KeepInstalled: + case S_Protected: + newStatus = S_Del; + NCDBG << "Deleting " << kind << " " << selectable->name().c_str() << endl; + break; + + //Keep status for not installed, taboo and to-be-deleted + case S_Del: + case S_AutoDel: + case S_NoInst: + case S_Taboo: + newStatus = oldStatus; + break; + } + } + + if (oldStatus != newStatus) + selectable->set_status( newStatus ); +} + + +bool NCPkgMenuExtras::exportToFile() +{ //Ask for file to save into + string filename = YUI::app()->askForSaveFileName( DEFAULT_EXPORT_FILE_NAME, + "*.xml", + _("Export List of All Packages and Patterns to File" )); + + if ( ! filename.empty() ) + { + zypp::syscontent::Writer writer; + const zypp::ResPool & pool = zypp::getZYpp()->pool(); + + //some strange C++ magic (c) by ma + for_each( pool.begin(), pool.end(), + boost::bind( &zypp::syscontent::Writer::addIf, + boost::ref(writer), + _1)); + + try + { + //open file for writing and try to dump syscontent into it + std::ofstream exportFile( filename.c_str() ); + exportFile.exceptions(std::ios_base::badbit | std::ios_base::failbit ); + exportFile << writer; + + NCMIL << "Exported list of packages and patterns to " << filename << endl; + } + + catch (std::exception & exception) + { + NCWAR << "Error exporting list of packages and patterns to " << filename << endl; + + //delete partially written file (don't care if it doesn't exist) + (void) unlink( filename.c_str() ); + + //present error popup to the user + NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ), + NCPkgNames::ErrorLabel(), + _("Error exporting list of packages and patterns to ") + // FIXME: String addition is evil for translators! + + filename, + NCPkgNames::OKLabel(), + ""); + errorMsg->setNiceSize(40,5); + NCursesEvent input = errorMsg->showInfoPopup(); + + YDialog::deleteTopmostDialog(); + } + + return true; + } + +} + +bool NCPkgMenuExtras::importFromFile() +{ + //ask for file to open + string filename = YUI::app()->askForExistingFile( DEFAULT_EXPORT_FILE_NAME, + "*.xml", + _("Import List of All Packages and Patterns from File")); + if ( ! filename.empty() ) + { + NCPkgTable * packageList = pkg->PackageList(); + NCMIL << "Importing list of packages and patterns from " << filename << endl; + + try + { + std::ifstream importFile ( filename.c_str() ); + zypp::syscontent::Reader reader (importFile); + + //maps to store package/pattern data into + map<string, ZyppReaderEntry> importPkgs; + map<string, ZyppReaderEntry> importPatterns; + + //Import syscontent reader to a map $[ "package_name" : pointer_to_data] + for (zypp::syscontent::Reader::const_iterator it = reader.begin(); + it != reader.end(); + it ++ ) + { + string kind = it->kind(); + + // importMapPair => std::pair<string, ZyppReaderEntry> + if ( kind == "package" ) + importPkgs.insert( importMapPair( it->name(), *it ) ); + else if ( kind == "pattern" ) + importPatterns.insert( importMapPair( it->name(), *it ) ); + } + + NCMIL << "Found " << importPkgs.size() << " packages and " << importPatterns.size() << " patterns." << endl; + + //Change status of appropriate packages and patterns + for (ZyppPoolIterator it = zyppPkgBegin(); + it != zyppPkgEnd(); + it++ ) + { + ZyppSel selectable = *it; + //isWanted => package name found in importPkgs map + importSelectable ( *it, importPkgs.find( selectable->name() ) != importPkgs.end(), "package" ); + } + + for (ZyppPoolIterator it = zyppPatternsBegin(); + it != zyppPatternsEnd(); + it++ ) + { + ZyppSel selectable = *it; + importSelectable ( *it, importPatterns.find( selectable->name() ) != importPatterns.end(), "pattern" ); + } + + //Switch to installation summary filter + pkg->fillSummaryList(NCPkgTable::L_Changes); + + //... and finally display the result + packageList->showInformation(); + packageList->setKeyboardFocus(); + + return true; + } + catch ( const zypp::Exception & exception ) + { + NCWAR << "Error importing list of packages and patterns from" << filename << endl; + + NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2) , + NCPkgNames::ErrorLabel(), + _("Error importing list of packages and patterns from ") + // FIXME: String addition is evil for translators! + + filename, + NCPkgNames::OKLabel(), + ""); + errorMsg->setNiceSize(40,5); + NCursesEvent input = errorMsg->showInfoPopup(); + + YDialog::deleteTopmostDialog(); + } + } + return true; + +} + bool NCPkgMenuExtras::showDiskSpace() { pkg->diskSpacePopup()->showInfoPopup( NCPkgNames::DiskspaceLabel() ); Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuExtras.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuExtras.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuExtras.h Thu Feb 28 12:10:38 2008 @@ -49,6 +49,12 @@ bool handleEvent (const NCursesEvent & event); + void importSelectable ( ZyppSel selectable, bool isWanted, const char*kind ); + + bool exportToFile(); + + bool importFromFile(); + bool showDiskSpace(); }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45098 - in /branches/SuSE-SLE-10-SP2-Branch/ldap-server: VERSION package/yast2-ldap-server.changes src/tree_structure.ycp
by rhafer＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: rhafer Date: Thu Feb 28 11:14:25 2008 New Revision: 45098 URL: http://svn.opensuse.org/viewcvs/yast?rev=45098&view=rev Log: Check for existing "shadowAccount" Objects when enabling password policies and warn the user (bnc#364833) Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-server/VERSION branches/SuSE-SLE-10-SP2-Branch/ldap-server/package/yast2-ldap-server.changes branches/SuSE-SLE-10-SP2-Branch/ldap-server/src/tree_structure.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ldap-s… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ldap-server/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/ldap-server/VERSION Thu Feb 28 11:14:25 2008 @@ -1 +1 @@ -2.13.23 +2.13.24 Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ldap-s… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/ldap-server/package/yast2-ldap-server.changes Thu Feb 28 11:14:25 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 28 08:55:10 CET 2008 - rhafer(a)suse.de + +- Check for existing "shadowAccount" Objects when enabling password + policies and warn the user (bnc#364833) + +------------------------------------------------------------------- Wed Apr 11 10:50:25 CEST 2007 - rhafer(a)suse.de - Keep Firewall-Settings when switching to configuration Dialog (Bug Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ldap-s… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ldap-server/src/tree_structure.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/ldap-server/src/tree_structure.ycp Thu Feb 28 11:14:25 2008 @@ -954,10 +954,42 @@ define boolean cb_input_db() ``{ - string suffix = current_tree_item; + string suffix = (string)widget_map[current_tree_item,"name"]:nil; y2milestone( "calling db input handler for suffix '%1'", suffix ); if ( handler_cmd == `cb_ppolicy_overlay ) { if ( UI::QueryWidget( `cb_ppolicy_overlay, `Value ) == true ) { + // Check if the Database has "shadowAccount" Objects and warn + // about possible conflicts + if ( (boolean) SCR::Execute(.ldap, + $[ "hostname":"localhost", "port": 389, "use_tls": "try" ] ) ) + { + y2milestone("checking for existing shadow account objects"); + list entries = (list)SCR::Read(.ldap.search, + $[ "base_dn" : suffix, + "filter" : "objectclass=shadowAccount", + "scope" : 2, + "attrsOnly" : true, + "attrs" : [], + "dn_only" : true ] ); + SCR::Execute(.ldap.unbind); + if ( size(entries) > 0 ) + { + if (! Popup::YesNo( _("The LDAP Database contains at least one \"shadowAccount\" object. +Using OpenLDAP's Password Policies and \"shadowAccount\" objects +together with pam_ldap can have unexpected effects, as they provide +overlapping functionality. +Do you really want to enable Password Policies?") ) ) + + { + UI::ChangeWidget( `cb_ppolicy_overlay, `Value, false ); + return true; + } + } else { + y2milestone("no shadow account objects found"); + } + } else { + y2milestone("failed to initialize LDAP connection while runnig ppolicy check"); + } UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , true ); UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , true ); UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , 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] r45097 - in /branches/SuSE-SLE-10-SP1-Branch/ldap-server: VERSION package/yast2-ldap-server.changes src/tree_structure.ycp
by rhafer＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: rhafer Date: Thu Feb 28 11:13:47 2008 New Revision: 45097 URL: http://svn.opensuse.org/viewcvs/yast?rev=45097&view=rev Log: Check for existing "shadowAccount" Objects when enabling password policies and warn the user (bnc#364833) Modified: branches/SuSE-SLE-10-SP1-Branch/ldap-server/VERSION branches/SuSE-SLE-10-SP1-Branch/ldap-server/package/yast2-ldap-server.changes branches/SuSE-SLE-10-SP1-Branch/ldap-server/src/tree_structure.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ldap-s… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ldap-server/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/ldap-server/VERSION Thu Feb 28 11:13:47 2008 @@ -1 +1 @@ -2.13.23 +2.13.24 Modified: branches/SuSE-SLE-10-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ldap-s… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Thu Feb 28 11:13:47 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 28 08:55:10 CET 2008 - rhafer(a)suse.de + +- Check for existing "shadowAccount" Objects when enabling password + policies and warn the user (bnc#364833) + +------------------------------------------------------------------- Wed Apr 11 10:50:25 CEST 2007 - rhafer(a)suse.de - Keep Firewall-Settings when switching to configuration Dialog (Bug Modified: branches/SuSE-SLE-10-SP1-Branch/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ldap-s… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ldap-server/src/tree_structure.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/ldap-server/src/tree_structure.ycp Thu Feb 28 11:13:47 2008 @@ -954,10 +954,42 @@ define boolean cb_input_db() ``{ - string suffix = current_tree_item; + string suffix = (string)widget_map[current_tree_item,"name"]:nil; y2milestone( "calling db input handler for suffix '%1'", suffix ); if ( handler_cmd == `cb_ppolicy_overlay ) { if ( UI::QueryWidget( `cb_ppolicy_overlay, `Value ) == true ) { + // Check if the Database has "shadowAccount" Objects and warn + // about possible conflicts + if ( (boolean) SCR::Execute(.ldap, + $[ "hostname":"localhost", "port": 389, "use_tls": "try" ] ) ) + { + y2milestone("checking for existing shadow account objects"); + list entries = (list)SCR::Read(.ldap.search, + $[ "base_dn" : suffix, + "filter" : "objectclass=shadowAccount", + "scope" : 2, + "attrsOnly" : true, + "attrs" : [], + "dn_only" : true ] ); + SCR::Execute(.ldap.unbind); + if ( size(entries) > 0 ) + { + if (! Popup::YesNo( _("The LDAP Database contains at least one \"shadowAccount\" object. +Using OpenLDAP's Password Policies and \"shadowAccount\" objects +together with pam_ldap can have unexpected effects, as they provide +overlapping functionality. +Do you really want to enable Password Policies?") ) ) + + { + UI::ChangeWidget( `cb_ppolicy_overlay, `Value, false ); + return true; + } + } else { + y2milestone("no shadow account objects found"); + } + } else { + y2milestone("failed to initialize LDAP connection while runnig ppolicy check"); + } UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , true ); UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , true ); UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , 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] r45096 - in /trunk/gtk: ChangeLog src/YGBarGraph.cc src/ygtkbargraph.c src/ygtkbargraph.h
by rpmcruz＠svn.opensuse.org 27 Feb '08

27 Feb '08

Author: rpmcruz Date: Wed Feb 27 23:38:23 2008 New Revision: 45096 URL: http://svn.opensuse.org/viewcvs/yast?rev=45096&view=rev Log: * src/YGBarGraph.cc & src/ygtkbargraph.c: honor bar graph segment's custom color. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGBarGraph.cc trunk/gtk/src/ygtkbargraph.c trunk/gtk/src/ygtkbargraph.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=45096&r1=45095… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Feb 27 23:38:23 2008 @@ -26,6 +26,8 @@ * src/yzyppwrapper.cc: added 10.3 zypp compatibility flag. + * src/YGBarGraph.cc & src/ygtkbargraph.c: honor bar graph segment's custom color. + 2008-02-27 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/yzyppwrapper.cc: got rid of depreacated warning. Modified: trunk/gtk/src/YGBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGBarGraph.cc?rev=45096&… ============================================================================== --- trunk/gtk/src/YGBarGraph.cc (original) +++ trunk/gtk/src/YGBarGraph.cc Wed Feb 27 23:38:23 2008 @@ -21,11 +21,20 @@ // YBarGraph virtual void doUpdate() { + GdkColor clr; ygtk_bar_graph_create_entries (YGTK_BAR_GRAPH (getWidget()), segments()); for (int i = 0; i < segments(); i++) { const YBarGraphSegment &s = segment (i); + GdkColor *c = 0; + if (s.hasSegmentColor()) { + const YColor &color = s.segmentColor(); + clr.red = color.red(); + clr.green = color.green(); + clr.blue = color.blue(); + c = &clr; + } ygtk_bar_graph_setup_entry (YGTK_BAR_GRAPH (getWidget()), i, - s.label().c_str(), s.value()); + s.label().c_str(), s.value(), c); } // FIXME: new libyui colors segments ... We probably should honor that } @@ -57,7 +66,7 @@ GtkWidget *graph = ygtk_bar_graph_new(); m_barGraph = YGTK_BAR_GRAPH (graph); ygtk_bar_graph_create_entries (m_barGraph, 3); - ygtk_bar_graph_setup_entry (m_barGraph, 0, usedLabel.c_str(), usedSize); + ygtk_bar_graph_setup_entry (m_barGraph, 0, usedLabel.c_str(), usedSize, NULL); /* Labels over the slider */ GtkWidget *labels_box, *free_label, *new_part_label; @@ -106,9 +115,9 @@ { IMPL ygtk_bar_graph_setup_entry (m_barGraph, 1, freeLabel().c_str(), - freeSize()); + freeSize(), NULL); ygtk_bar_graph_setup_entry (m_barGraph, 2, newPartLabel().c_str(), - newPartSize()); + newPartSize(), NULL); // block connections g_signal_handlers_block_by_func (m_scale, Modified: trunk/gtk/src/ygtkbargraph.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkbargraph.c?rev=45096… ============================================================================== --- trunk/gtk/src/ygtkbargraph.c (original) +++ trunk/gtk/src/ygtkbargraph.c Wed Feb 27 23:38:23 2008 @@ -61,8 +61,8 @@ } } -void ygtk_bar_graph_setup_entry (YGtkBarGraph *bar, int index, - const gchar *label_entry, int value) +void ygtk_bar_graph_setup_entry (YGtkBarGraph *bar, int index, const gchar *label_entry, + int value, GdkColor *color) { YGtkRatioBoxChild *box_child = (YGtkRatioBoxChild *) g_list_nth_data (YGTK_RATIO_BOX (bar)->children, index); @@ -130,10 +130,14 @@ { 46, 52, 54 }, // Aluminium 6 }; - const guint *color = palette [index % G_N_ELEMENTS (palette)]; - YGtkColoredLabel *color_label = YGTK_COLORED_LABEL (label); - ygtk_colored_label_set_background (color_label, color[0], color[1], color[2]); + + if (color) + ygtk_colored_label_set_background (color_label, color->red, color->green, color->blue); + else { + const guint *color = palette [index % G_N_ELEMENTS (palette)]; + ygtk_colored_label_set_background (color_label, color[0], color[1], color[2]); + } } static void ygtk_bar_graph_class_init (YGtkBarGraphClass *klass) Modified: trunk/gtk/src/ygtkbargraph.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkbargraph.h?rev=45096… ============================================================================== --- trunk/gtk/src/ygtkbargraph.h (original) +++ trunk/gtk/src/ygtkbargraph.h Wed Feb 27 23:38:23 2008 @@ -46,7 +46,7 @@ void ygtk_bar_graph_create_entries (YGtkBarGraph *bar, guint entries); void ygtk_bar_graph_setup_entry (YGtkBarGraph *bar, int index, - const gchar *label_entry, int value); + const gchar *label_entry, int value, GdkColor *color); G_END_DECLS #endif /*YGTK_BAR_GRAPH_H*/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0