March 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56398 - /tags/branch-Code-11-2_17_38/pkg-bindings/
by lslezak＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: lslezak Date: Wed Mar 25 17:11:44 2009 New Revision: 56398 URL: http://svn.opensuse.org/viewcvs/yast?rev=56398&view=rev Log: Created tag branch-Code-11-2_17_38 for pkg-bindings Added: tags/branch-Code-11-2_17_38/pkg-bindings/ - copied from r56397, branches/SuSE-Code-11-Branch/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56397 - /tags/branch-Code-11-2_17_38/
by lslezak＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: lslezak Date: Wed Mar 25 17:11:42 2009 New Revision: 56397 URL: http://svn.opensuse.org/viewcvs/yast?rev=56397&view=rev Log: Created tag branch-Code-11-2_17_38 Added: tags/branch-Code-11-2_17_38/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56396 - in /branches/SuSE-Code-11-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Source_Get.cc
by lslezak＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: lslezak Date: Wed Mar 25 17:08:20 2009 New Revision: 56396 URL: http://svn.opensuse.org/viewcvs/yast?rev=56396&view=rev Log: - Fixed Pkg::SourceURL() - remove "credentials" query from URL after obtaining the credentials from CredentialManager - 2.17.38 Modified: branches/SuSE-Code-11-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Get.cc Modified: branches/SuSE-Code-11-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/VERSION Wed Mar 25 17:08:20 2009 @@ -1 +1 @@ -2.17.37 +2.17.38 Modified: branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Wed Mar 25 17:08:20 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 25 16:55:36 CET 2009 - lslezak(a)suse.cz + +- Fixed Pkg::SourceURL() - remove "credentials" query from URL + after obtaining the credentials from CredentialManager +- 2.17.38 + +------------------------------------------------------------------- Fri Mar 20 15:04:10 CET 2009 - lslezak(a)suse.cz - Fixed Pkg::SourceURL() - read username and password using Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Get.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Get.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Get.cc Wed Mar 25 17:08:20 2009 @@ -211,6 +211,17 @@ { y2warning("Invalid authentication data, returning URL without username and password"); } + + // does the url contain credentials query? + zypp::url::ParamMap params = url.getQueryStringMap(); + zypp::url::ParamMap::iterator map_it = params.find("credentials"); + + if (map_it != params.end()) + { + y2milestone("Removing credentials query from URL"); + params.erase(map_it); + url.setQueryStringMap(params); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56395 - in /trunk/storage: VERSION libstorage/src/Volume.h package/yast2-storage.changes
by aschnell＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: aschnell Date: Wed Mar 25 17:07:59 2009 New Revision: 56395 URL: http://svn.opensuse.org/viewcvs/yast?rev=56395&view=rev Log: - fixed commit order for partitions that are resized and deleted (bnc #473944) Modified: trunk/storage/VERSION trunk/storage/libstorage/src/Volume.h trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=56395&r1=563… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Wed Mar 25 17:07:59 2009 @@ -1 +1 @@ -2.18.8 +2.18.9 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 Wed Mar 25 17:07:59 2009 @@ -86,9 +86,9 @@ const string& getMount() const { return mp; } bool hasOrigMount() const { return !orig_mp.empty(); } bool needRemount() const; - bool needShrink() const { return(size_k<orig_size_k); } - bool needExtend() const { return(size_k>orig_size_k); } - long long extendSize() const { return(size_k-orig_size_k);} + bool needShrink() const { return !del && size_k<orig_size_k; } + bool needExtend() const { return !del && size_k>orig_size_k; } + long long extendSize() const { return size_k-orig_size_k; } storage::FsType getFs() const { return fs; } void setFs( storage::FsType val ) { detected_fs=fs=val; } void setUuid( const string& id ) { uuid=id; } 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 Mar 25 17:07:59 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 25 16:58:10 CET 2009 - aschnell(a)suse.de + +- fixed commit order for partitions that are resized and deleted + (bnc #473944) +- 2.18.9 + +------------------------------------------------------------------- Mon Mar 16 17:29:50 CET 2009 - aschnell(a)suse.de - disable mount buttons in repair mode (see bnc #480830) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56394 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Source_Get.cc
by lslezak＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: lslezak Date: Wed Mar 25 17:03:11 2009 New Revision: 56394 URL: http://svn.opensuse.org/viewcvs/yast?rev=56394&view=rev Log: - Fixed Pkg::SourceURL() - remove "credentials" query from URL after obtaining the credentials from CredentialManager Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Source_Get.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Wed Mar 25 17:03:11 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 25 16:55:36 CET 2009 - lslezak(a)suse.cz + +- Fixed Pkg::SourceURL() - remove "credentials" query from URL + after obtaining the credentials from CredentialManager + +------------------------------------------------------------------- Fri Mar 20 15:04:10 CET 2009 - lslezak(a)suse.cz - Fixed Pkg::SourceURL() - read username and password using 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 Wed Mar 25 17:03:11 2009 @@ -211,6 +211,17 @@ { y2warning("Invalid authentication data, returning URL without username and password"); } + + // does the url contain credentials query? + zypp::url::ParamMap params = url.getQueryStringMap(); + zypp::url::ParamMap::iterator map_it = params.find("credentials"); + + if (map_it != params.end()) + { + y2milestone("Removing credentials query from URL"); + params.erase(map_it); + url.setQueryStringMap(params); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56393 - in /trunk/yast2: library/packages/src/PackageCallbacks.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: lslezak Date: Wed Mar 25 16:43:11 2009 New Revision: 56393 URL: http://svn.opensuse.org/viewcvs/yast?rev=56393&view=rev Log: - Fixed layout of the authentication popup Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Wed Mar 25 16:43:11 2009 @@ -2454,10 +2454,10 @@ `HSpacing(1), `VBox( // textentry label - `TextEntry(`id(`username), _("&User Name"), username), + `InputField(`id(`username), `opt(`hstretch), _("&User Name"), username), `VSpacing(0.1), // textentry label - `Password(`id(`password), _("&Password"), password) + `Password(`id(`password), `opt(`hstretch), _("&Password"), password) ), `HSpacing(1) ), 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 Mar 25 16:43:11 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 25 16:41:53 CET 2009 - lslezak(a)suse.cz + +- Fixed layout of the authentication popup + +------------------------------------------------------------------- Tue Mar 17 20:05:45 CET 2009 - lslezak(a)suse.cz - moved functions RunCommandWithTimeout() and RunDumbTimeout() -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56392 - in /trunk/storage/libstorage/src: Container.cc Container.h Dasd.cc Dasd.h Disk.cc Disk.h DmPart.h DmPartCo.cc DmPartCo.h LvmVg.cc LvmVg.h Partition.h Volume.h
by aschnell＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: aschnell Date: Wed Mar 25 16:23:28 2009 New Revision: 56392 URL: http://svn.opensuse.org/viewcvs/yast?rev=56392&view=rev Log: - getToCommit can be const - some cleanup Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Container.h trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Dasd.h trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Disk.h trunk/storage/libstorage/src/DmPart.h trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/DmPartCo.h trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/LvmVg.h trunk/storage/libstorage/src/Partition.h trunk/storage/libstorage/src/Volume.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 Wed Mar 25 16:23:28 2009 @@ -58,7 +58,7 @@ void -Container::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) +Container::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) const { unsigned long oco = col.size(); unsigned long ovo = vol.size(); @@ -66,8 +66,8 @@ { case DECREASE: { - VolPair p = volPair( stageDecrease ); - for( VolIterator i=p.begin(); i!=p.end(); ++i ) + ConstVolPair p = volPair( stageDecrease ); + for( ConstVolIterator i=p.begin(); i!=p.end(); ++i ) vol.push_back( &(*i) ); if( deleted() ) col.push_back( this ); @@ -75,8 +75,8 @@ break; case INCREASE: { - VolPair p = volPair( stageCreate ); - for( VolIterator i=p.begin(); i!=p.end(); ++i ) + ConstVolPair p = volPair( stageCreate ); + for( ConstVolIterator i=p.begin(); i!=p.end(); ++i ) vol.push_back( &(*i) ); if( created() ) col.push_back( this ); @@ -84,15 +84,15 @@ break; case FORMAT: { - VolPair p = volPair( stageFormat ); - for( VolIterator i=p.begin(); i!=p.end(); ++i ) + ConstVolPair p = volPair( stageFormat ); + for( ConstVolIterator i=p.begin(); i!=p.end(); ++i ) vol.push_back( &(*i) ); } break; case MOUNT: { - VolPair p = volPair( stageMount ); - for( VolIterator i=p.begin(); i!=p.end(); ++i ) + ConstVolPair p = volPair( stageMount ); + for( ConstVolIterator i=p.begin(); i!=p.end(); ++i ) vol.push_back( &(*i) ); } break; 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 Wed Mar 25 16:23:28 2009 @@ -50,9 +50,9 @@ virtual string getDiffString( const Container& c ) const; virtual void logDifference( const Container& c ) const; - virtual void getCommitActions( std::list<storage::commitAction*>& l ) const; + virtual void getCommitActions(list<storage::commitAction*>& l) const; virtual void getToCommit(storage::CommitStage stage, list<const Container*>& col, - list<const Volume*>& vol); + list<const Volume*>& vol) const; virtual int commitChanges( storage::CommitStage stage ); virtual int commitChanges( storage::CommitStage stage, Volume* vol ); 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 Wed Mar 25 16:23:28 2009 @@ -482,13 +482,13 @@ void -Dasd::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) +Dasd::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) const { unsigned long oco = col.size(); unsigned long ovo = vol.size(); if( stage==DECREASE ) { - VolPair p = volPair( stageDecrease ); + ConstVolPair p = volPair( stageDecrease ); if( !p.empty() ) vol.push_back( &(*(p.begin())) ); if( deleted() || init_disk ) @@ -496,7 +496,7 @@ } else if( stage==INCREASE ) { - VolPair p = volPair( stageCreate ); + ConstVolPair p = volPair( stageCreate ); if( !p.empty() ) vol.push_back( &(*(p.begin())) ); } Modified: trunk/storage/libstorage/src/Dasd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.h?re… ============================================================================== --- trunk/storage/libstorage/src/Dasd.h (original) +++ trunk/storage/libstorage/src/Dasd.h Wed Mar 25 16:23:28 2009 @@ -29,9 +29,9 @@ string fdasdText() const; string dasdfmtText( bool doing ) const; static string dasdfmtTexts( bool single, const string& devs ); - void getCommitActions( std::list<storage::commitAction*>& l ) const; + void getCommitActions(list<storage::commitAction*>& l) const; void getToCommit(storage::CommitStage stage, list<const Container*>& col, - list<const Volume*>& vol); + list<const Volume*>& vol) const; int commitChanges( storage::CommitStage stage ); bool detectGeometry(); 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 Wed Mar 25 16:23:28 2009 @@ -1756,15 +1756,15 @@ void -Disk::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) +Disk::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) const { unsigned long oco = col.size(); unsigned long ovo = vol.size(); Container::getToCommit( stage, col, vol ); if( stage==INCREASE ) { - PartPair p = partPair( Partition::toChangeId ); - for( PartIter i=p.begin(); i!=p.end(); ++i ) + ConstPartPair p = partPair( Partition::toChangeId ); + for( ConstPartIter i=p.begin(); i!=p.end(); ++i ) if( find( vol.begin(), vol.end(), &(*i) )==vol.end() ) vol.push_back( &(*i) ); } Modified: trunk/storage/libstorage/src/Disk.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?re… ============================================================================== --- trunk/storage/libstorage/src/Disk.h (original) +++ trunk/storage/libstorage/src/Disk.h Wed Mar 25 16:23:28 2009 @@ -81,9 +81,9 @@ string& device) const; int destroyPartitionTable( const string& new_label ); unsigned availablePartNumber(storage::PartitionType type = storage::PRIMARY) const; - virtual void getCommitActions( std::list<storage::commitAction*>& l ) const; + virtual void getCommitActions(list<storage::commitAction*>& l) const; virtual void getToCommit(storage::CommitStage stage, list<const Container*>& col, - list<const Volume*>& vol); + list<const Volume*>& vol) const; virtual int commitChanges( storage::CommitStage stage ); int commitChanges( storage::CommitStage stage, Volume* vol ); int freeCylindersAfterPartition(const Partition* p, unsigned long& freeCyls) const; 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 Wed Mar 25 16:23:28 2009 @@ -30,7 +30,7 @@ void updateMinor(); void updateSize( ProcPart& pp ); void updateSize(); - void getCommitActions( std::list<storage::commitAction*>& l ) const; + void getCommitActions(list<storage::commitAction*>& l) const; void addUdevData(); virtual const std::list<string> udevId() const; virtual string setTypeText( bool doing=true ) const; 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 Wed Mar 25 16:23:28 2009 @@ -657,7 +657,7 @@ void -DmPartCo::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) +DmPartCo::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) const { y2mil("col:" << col.size() << " vol:" << vol.size()); getStorage()->logCo( this ); @@ -666,8 +666,8 @@ Container::getToCommit( stage, col, vol ); if( stage==INCREASE ) { - DmPartPair p = dmpartPair( toChangeId ); - for( DmPartIter i=p.begin(); i!=p.end(); ++i ) + ConstDmPartPair p = dmpartPair( toChangeId ); + for( ConstDmPartIter i=p.begin(); i!=p.end(); ++i ) if( find( vol.begin(), vol.end(), &(*i) )==vol.end() ) vol.push_back( &(*i) ); } 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 Wed Mar 25 16:23:28 2009 @@ -75,9 +75,9 @@ { return disk->kbToCylinder( val ); } string getPartName( unsigned nr ) const; - virtual void getCommitActions( std::list<storage::commitAction*>& l ) const; + virtual void getCommitActions(list<storage::commitAction*>& l) const; virtual void getToCommit(storage::CommitStage stage, list<const Container*>& col, - list<const Volume*>& vol); + list<const Volume*>& vol) const; virtual int commitChanges( storage::CommitStage stage ); int commitChanges( storage::CommitStage stage, Volume* vol ); 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 Wed Mar 25 16:23:28 2009 @@ -904,7 +904,7 @@ void -LvmVg::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) +LvmVg::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) const { unsigned long oco = col.size(); unsigned long ovo = vol.size(); Modified: trunk/storage/libstorage/src/LvmVg.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.h?r… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.h (original) +++ trunk/storage/libstorage/src/LvmVg.h Wed Mar 25 16:23:28 2009 @@ -45,10 +45,10 @@ int setPeSize( long long unsigned peSizeK ); void normalizeDmDevices(); - void getCommitActions( std::list<storage::commitAction*>& l ) const; - int commitChanges( storage::CommitStage stage ); + void getCommitActions(list<storage::commitAction*>& l) const; void getToCommit(storage::CommitStage stage, list<const Container*>& col, - list<const Volume*>& vol); + list<const Volume*>& vol) const; + int commitChanges( storage::CommitStage stage ); int resizeVolume( Volume* v, unsigned long long newSize ); int removeVolume( Volume* v ); void getInfo( storage::LvmVgInfo& info ) const; Modified: trunk/storage/libstorage/src/Partition.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition… ============================================================================== --- trunk/storage/libstorage/src/Partition.h (original) +++ trunk/storage/libstorage/src/Partition.h Wed Mar 25 16:23:28 2009 @@ -53,7 +53,7 @@ string createText( bool doing=true ) const; string formatText(bool doing=true) const; string resizeText(bool doing=true) const; - void getCommitActions( std::list<storage::commitAction*>& l ) const; + void getCommitActions(list<storage::commitAction*>& l) const; string setTypeText( bool doing=true ) const; int setFormat( bool format=true, storage::FsType fs=storage::REISERFS ); int changeMount( const string& val ); 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 Wed Mar 25 16:23:28 2009 @@ -153,7 +153,7 @@ virtual string createText(bool doing=true) const; virtual string resizeText(bool doing=true) const; virtual string formatText(bool doing=true) const; - virtual void getCommitActions( std::list<storage::commitAction*>& l ) const; + virtual void getCommitActions(list<storage::commitAction*>& l) const; string mountText( bool doing=true ) const; string labelText( bool doing=true ) const; string losetupText( bool doing=true ) 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] r56391 - in /trunk/storage/libstorage/src: Storage.cc StorageTypes.h
by aschnell＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: aschnell Date: Wed Mar 25 15:51:16 2009 New Revision: 56391 URL: http://svn.opensuse.org/viewcvs/yast?rev=56391&view=rev Log: - use fancy coding - some cleanup Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/StorageTypes.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 Wed Mar 25 15:51:16 2009 @@ -15,6 +15,7 @@ #include <errno.h> #include <set> +#include <array> #include <fstream> #include <sstream> #include <boost/algorithm/string.hpp> @@ -3779,27 +3780,24 @@ { int ret = 0; y2mil("p.length:" << p.length()); - CommitStage a[] = { DECREASE, INCREASE, FORMAT, MOUNT }; - CommitStage* pt = a; - while( unsigned(pt-a) < lengthof(a) ) - { - bool new_pair = false; + + typedef array<CommitStage, 4> Stages; + const Stages stages = { { DECREASE, INCREASE, FORMAT, MOUNT } }; + + for (Stages::const_iterator stage = stages.begin(); stage != stages.end(); ++stage) + { list<const Container*> colist; list<const Volume*> vlist; if (ret == 0) { for (ContIterator i = p.begin(); i != p.end(); ++i) - i->getToCommit(*pt, colist, vlist); + i->getToCommit(*stage, colist, vlist); } -#if 0 - if( *pt == FORMAT && instsys() ) - { - activateHld( true ); - } -#endif + + bool new_pair = false; list<commitAction*> todo; - sortCommitLists( *pt, colist, vlist, todo ); + sortCommitLists(*stage, colist, vlist, todo); list<commitAction*>::iterator ac = todo.begin(); while( ret==0 && ac != todo.end() ) { @@ -3810,7 +3808,7 @@ if( cont ) { bool cont_removed = co->deleted() && type==LVM; - ret = co->commitChanges( *pt ); + ret = co->commitChanges(*stage); cont_removed = cont_removed && ret==0; if( cont_removed ) { @@ -3820,7 +3818,7 @@ } else { - ret = co->commitChanges( *pt, const_cast<Volume*>((*ac)->vol()) ); + ret = co->commitChanges(*stage, const_cast<Volume*>((*ac)->vol())); } if( ret!=0 ) { @@ -3831,13 +3829,12 @@ delete( *ac ); ++ac; } - y2mil("stage:" << *pt << " new_pair:" << new_pair); + y2mil("stage:" << *stage << " new_pair:" << new_pair); if( new_pair ) { p = cPair( fnc ); new_pair = false; } - pt++; if( !todo.empty() ) { SystemCmd c; 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 Wed Mar 25 15:51:16 2009 @@ -65,7 +65,8 @@ }; - typedef enum { DECREASE, INCREASE, FORMAT, MOUNT } CommitStage; + enum CommitStage { DECREASE, INCREASE, FORMAT, MOUNT }; + class Volume; class 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] r56390 - in /trunk/storage/libstorage/src: Container.cc Container.h Dasd.cc Dasd.h Disk.cc Disk.h DmPartCo.cc DmPartCo.h LvmVg.cc LvmVg.h Storage.cc Storage.h
by aschnell＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: aschnell Date: Wed Mar 25 15:33:23 2009 New Revision: 56390 URL: http://svn.opensuse.org/viewcvs/yast?rev=56390&view=rev Log: - make getToCommit return void and added some const Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Container.h trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Dasd.h trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Disk.h trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/DmPartCo.h trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/LvmVg.h trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.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 Wed Mar 25 15:33:23 2009 @@ -56,10 +56,10 @@ static bool stageMount( const Volume& v ) { return( v.needRemount()||v.needFstabUpdate()); } -int Container::getToCommit( CommitStage stage, list<Container*>& col, - list<Volume*>& vol ) - { - int ret = 0; + +void +Container::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) +{ unsigned long oco = col.size(); unsigned long ovo = vol.size(); switch( stage ) @@ -96,14 +96,11 @@ vol.push_back( &(*i) ); } break; - default: - break; } if( col.size()!=oco || vol.size()!=ovo ) - y2mil("ret:" << ret << " stage:" << stage << " col:" << col.size() << " vol:" << - vol.size()); - return( ret ); - } + y2mil("stage:" << stage << " col:" << col.size() << " vol:" << vol.size()); +} + int Container::commitChanges( CommitStage stage, Volume* vol ) { 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 Wed Mar 25 15:33:23 2009 @@ -7,8 +7,11 @@ #include "y2storage/StorageTypes.h" #include "y2storage/StorageTmpl.h" + namespace storage { + using std::list; + class Container { @@ -48,9 +51,8 @@ virtual void logDifference( const Container& c ) const; virtual void getCommitActions( std::list<storage::commitAction*>& l ) const; - virtual int getToCommit( storage::CommitStage stage, - std::list<Container*>& col, - std::list<Volume*>& vol ); + virtual void getToCommit(storage::CommitStage stage, list<const Container*>& col, + list<const Volume*>& vol); virtual int commitChanges( storage::CommitStage stage ); virtual int commitChanges( storage::CommitStage stage, Volume* vol ); 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 Wed Mar 25 15:33:23 2009 @@ -480,10 +480,10 @@ return( txt ); } -int Dasd::getToCommit( CommitStage stage, list<Container*>& col, - list<Volume*>& vol ) - { - int ret = 0; + +void +Dasd::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) +{ unsigned long oco = col.size(); unsigned long ovo = vol.size(); if( stage==DECREASE ) @@ -501,11 +501,11 @@ vol.push_back( &(*(p.begin())) ); } else - ret = Disk::getToCommit( stage, col, vol ); + Disk::getToCommit( stage, col, vol ); if( col.size()!=oco || vol.size()!=ovo ) - y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); - return( ret ); - } + y2mil("stage:" << stage << " col:" << col.size() << " vol:" << vol.size()); +} + int Dasd::commitChanges( CommitStage stage ) { Modified: trunk/storage/libstorage/src/Dasd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.h?re… ============================================================================== --- trunk/storage/libstorage/src/Dasd.h (original) +++ trunk/storage/libstorage/src/Dasd.h Wed Mar 25 15:33:23 2009 @@ -3,8 +3,11 @@ #include "y2storage/Disk.h" + namespace storage { + using std::list; + class SystemCmd; class ProcPart; @@ -27,8 +30,8 @@ string dasdfmtText( bool doing ) const; static string dasdfmtTexts( bool single, const string& devs ); void getCommitActions( std::list<storage::commitAction*>& l ) const; - int getToCommit( storage::CommitStage stage, std::list<Container*>& col, - std::list<Volume*>& vol ); + void getToCommit(storage::CommitStage stage, list<const Container*>& col, + list<const Volume*>& vol); int commitChanges( storage::CommitStage stage ); bool detectGeometry(); 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 Wed Mar 25 15:33:23 2009 @@ -1754,10 +1754,10 @@ return( ret ); } -int Disk::getToCommit( CommitStage stage, list<Container*>& col, - list<Volume*>& vol ) + +void +Disk::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) { - int ret = 0; unsigned long oco = col.size(); unsigned long ovo = vol.size(); Container::getToCommit( stage, col, vol ); @@ -1769,8 +1769,7 @@ vol.push_back( &(*i) ); } if( col.size()!=oco || vol.size()!=ovo ) - y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); - return( ret ); + y2mil("stage:" << stage << " col:" << col.size() << " vol:" << vol.size()); } int Disk::commitChanges( CommitStage stage, Volume* vol ) Modified: trunk/storage/libstorage/src/Disk.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?re… ============================================================================== --- trunk/storage/libstorage/src/Disk.h (original) +++ trunk/storage/libstorage/src/Disk.h Wed Mar 25 15:33:23 2009 @@ -6,8 +6,11 @@ #include "y2storage/Container.h" #include "y2storage/Partition.h" + namespace storage { + using std::list; + class Storage; class SystemCmd; @@ -79,9 +82,8 @@ int destroyPartitionTable( const string& new_label ); unsigned availablePartNumber(storage::PartitionType type = storage::PRIMARY) const; virtual void getCommitActions( std::list<storage::commitAction*>& l ) const; - virtual int getToCommit( storage::CommitStage stage, - std::list<Container*>& col, - std::list<Volume*>& vol ); + virtual void getToCommit(storage::CommitStage stage, list<const Container*>& col, + list<const Volume*>& vol); virtual int commitChanges( storage::CommitStage stage ); int commitChanges( storage::CommitStage stage, Volume* vol ); int freeCylindersAfterPartition(const Partition* p, unsigned long& freeCyls) const; 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 Wed Mar 25 15:33:23 2009 @@ -655,10 +655,10 @@ return( p!=NULL && !d.deleted() && Partition::toChangeId(*p) ); } -int DmPartCo::getToCommit( CommitStage stage, list<Container*>& col, - list<Volume*>& vol ) - { - int ret = 0; + +void +DmPartCo::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) +{ y2mil("col:" << col.size() << " vol:" << vol.size()); getStorage()->logCo( this ); unsigned long oco = col.size(); @@ -674,9 +674,8 @@ if( del_ptable && find( col.begin(), col.end(), this )==col.end() ) col.push_back( this ); if( col.size()!=oco || vol.size()!=ovo ) - y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); - return( ret ); - } + y2mil("stage:" << stage << " col:" << col.size() << " vol:" << vol.size()); +} int DmPartCo::commitChanges( CommitStage stage, Volume* vol ) 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 Wed Mar 25 15:33:23 2009 @@ -7,8 +7,11 @@ #include "y2storage/Disk.h" #include "y2storage/DmPart.h" + namespace storage { + using std::list; + class Storage; class SystemCmd; @@ -73,9 +76,8 @@ string getPartName( unsigned nr ) const; virtual void getCommitActions( std::list<storage::commitAction*>& l ) const; - virtual int getToCommit( storage::CommitStage stage, - std::list<Container*>& col, - std::list<Volume*>& vol ); + virtual void getToCommit(storage::CommitStage stage, list<const Container*>& col, + list<const Volume*>& vol); virtual int commitChanges( storage::CommitStage stage ); int commitChanges( storage::CommitStage stage, Volume* vol ); 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 Wed Mar 25 15:33:23 2009 @@ -902,10 +902,10 @@ p = new Pv; } -int LvmVg::getToCommit( CommitStage stage, list<Container*>& col, - list<Volume*>& vol ) - { - int ret = 0; + +void +LvmVg::getToCommit(CommitStage stage, list<const Container*>& col, list<const Volume*>& vol) +{ unsigned long oco = col.size(); unsigned long ovo = vol.size(); Container::getToCommit( stage, col, vol ); @@ -926,9 +926,9 @@ } } if( col.size()!=oco || vol.size()!=ovo ) - y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); - return( ret ); - } + y2mil("stage:" << stage << " col:" << col.size() << " vol:" << vol.size()); +} + int LvmVg::commitChanges( CommitStage stage ) { Modified: trunk/storage/libstorage/src/LvmVg.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.h?r… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.h (original) +++ trunk/storage/libstorage/src/LvmVg.h Wed Mar 25 15:33:23 2009 @@ -4,8 +4,11 @@ #include "y2storage/PeContainer.h" #include "y2storage/LvmLv.h" + namespace storage { + using std::list; + class LvmVg : public PeContainer { @@ -44,8 +47,8 @@ void normalizeDmDevices(); void getCommitActions( std::list<storage::commitAction*>& l ) const; int commitChanges( storage::CommitStage stage ); - int getToCommit( storage::CommitStage stage, std::list<Container*>& col, - std::list<Volume*>& vol ); + void getToCommit(storage::CommitStage stage, list<const Container*>& col, + list<const Volume*>& vol); int resizeVolume( Volume* v, unsigned long long newSize ); int removeVolume( Volume* v ); void getInfo( storage::LvmVgInfo& info ) 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 Wed Mar 25 15:33:23 2009 @@ -3627,8 +3627,8 @@ } void -Storage::sortCommitLists( CommitStage stage, list<Container*>& co, - list<Volume*>& vl, list<commitAction*>& todo ) +Storage::sortCommitLists( CommitStage stage, list<const Container*>& co, + list<const Volume*>& vl, list<commitAction*>& todo ) { co.sort( (stage==DECREASE)?sort_cont_up:sort_cont_down ); std::ostringstream b; @@ -3644,9 +3644,9 @@ vl.sort( sort_vol_mount ); else vl.sort( sort_vol_normal ); - for( list<Container*>::const_iterator i=co.begin(); i!=co.end(); ++i ) + for( list<const Container*>::const_iterator i=co.begin(); i!=co.end(); ++i ) todo.push_back( new commitAction( stage, (*i)->type(), *i )); - for( list<Volume*>::const_iterator i=vl.begin(); i!=vl.end(); ++i ) + for( list<const Volume*>::const_iterator i=vl.begin(); i!=vl.end(); ++i ) todo.push_back( new commitAction( stage, (*i)->cType(), *i )); b.str(""); b << "unsorted actions <"; @@ -3665,7 +3665,7 @@ todo.sort( cont_less<commitAction>() ); y2mil("stage:" << stage); b << "sorted co <"; - for( list<Container*>::const_iterator i=co.begin(); i!=co.end(); ++i ) + for( list<const Container*>::const_iterator i=co.begin(); i!=co.end(); ++i ) { if( i!=co.begin() ) b << " "; @@ -3675,7 +3675,7 @@ y2mil(b.str()); b.str(""); b << "sorted vol <"; - for( list<Volume*>::const_iterator i=vl.begin(); i!=vl.end(); ++i ) + for( list<const Volume*>::const_iterator i=vl.begin(); i!=vl.end(); ++i ) { if( i!=vl.begin() ) b << " "; @@ -3784,14 +3784,14 @@ while( unsigned(pt-a) < lengthof(a) ) { bool new_pair = false; - list<Container*> colist; - list<Volume*> vlist; - ContIterator i = p.begin(); - while( ret==0 && i != p.end() ) - { - ret = i->getToCommit( *pt, colist, vlist ); - ++i; - } + list<const Container*> colist; + list<const Volume*> vlist; + + if (ret == 0) + { + for (ContIterator i = p.begin(); i != p.end(); ++i) + i->getToCommit(*pt, colist, vlist); + } #if 0 if( *pt == FORMAT && instsys() ) { 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 Wed Mar 25 15:33:23 2009 @@ -1691,8 +1691,8 @@ void logVolumes( const string& Dir ); int commitPair( CPair& p, bool (* fnc)( const Container& ) ); void sortCommitLists( storage::CommitStage stage, - std::list<Container*>& co, - std::list<Volume*>& vl, + std::list<const Container*>& co, + std::list<const Volume*>& vl, std::list<storage::commitAction*>& todo ); bool ignoreError( std::list<commitAction*>::iterator i, std::list<commitAction*>& al ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56389 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: aschnell Date: Wed Mar 25 14:11:05 2009 New Revision: 56389 URL: http://svn.opensuse.org/viewcvs/yast?rev=56389&view=rev Log: - removed unused variable 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 Wed Mar 25 14:11:05 2009 @@ -3733,7 +3733,6 @@ assertInit(); lastAction.clear(); extendedError.clear(); - SystemCmd c; CPair p = cPair( notLoop ); int ret = 0; y2mil("empty:" << p.empty()); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0