Differential D5122 Diff 14239 projectbuilders/makebuilder/makejob.cpp

Changeset View

Standalone View

View Options

projectbuilders/makebuilder/makejob.cpp

Context not available.
177 bool runAsRoot = builderGroup.readEntry( "Install As Root", false ); 177​ bool runAsRoot = builderGroup.readEntry( "Install As Root", false );
178 if ( runAsRoot && m_command == InstallCommand ) 178​ if ( runAsRoot && m_command == InstallCommand )
179 { 179​ {
180 int suCommand = builderGroup.readEntry( "Su Command", 0 ); 180​ QString suCommand = builderGroup.readEntry( "Su Command", QString() );
ematirovUnsubmitted
Done

I wonder if that change will drop previous user selection, won't it? If so, maybe it's better to workaround that somehow.
Thus, in that scenario correct command should be chosen:

  1. I use previous version of KDevelop.
  2. I set su command to "kdesu".
  3. I update KDevelop to version after your patch.
  4. I expect that su command is still "kdesu".
ematirov: I wonder if that change will drop previous user selection, won't it? If so, maybe it's better…
geetamcAuthorUnsubmitted
Not Done

Yes, you are right, what I have done is:

  1. Convert suCommand toInt(&ok, 10) and store it in a variable say, suCommandNum
  1. If ( ok ) then have a switch block on suCommandNum and accordingly set a variable suCommandStr.
  1. Write suCommandStr to Entry "Su Command". (so that next time ok becomes false)
  1. Read the Entry "Su Command" and store it in variable suCommand.

Rest remains the same suCommand when split returns a QStringList(), which is returned by the function if it isn't empty.

If everyone concerned is fine with it, I will update the diff.

geetamc: Yes, you are right, what I have done is: 1) Convert suCommand toInt(&ok, 10) and store it in a…
181 QStringList arguments; 181​ bool suCommandIsDigit;
182 QString suCommandName; 182​ QStringList suCommandWithArg;
183 switch( suCommand ) { 183​ int suCommandNum = suCommand.toInt(&suCommandIsDigit);
184 case 1: 184​ /*
185 return QStringList() << QStringLiteral("kdesudo") << QStringLiteral("-t"); 185​ * "if(suCommandIsDigit)" block exists only because of backwards compatibility
186 186​ * reasons, In earlier versions of KDevelop, suCommand's type was
zhigalinUnsubmitted
Not Done

Unused!

zhigalin: Unused!
187 case 2: 187​ * int, if a user upgrades to current version from an older version,
188 return QStringList() << QStringLiteral("sudo"); 188​ * suCommandIsDigit will become "true" and we will set suCommand according
189 189​ * to the stored config entry.
190 default: 190​ */
191 return QStringList() << QStringLiteral("kdesu") << QStringLiteral("-t"); 191​ if(suCommandIsDigit)
192​ {
193​ switch(suCommandNum)
194​ {
195​ case 1:
brauchUnsubmitted
Not Done

you can use {"kdesu", "-t"} these days, and {customCommand} in the previous line, but not an issue

brauch: you can use {"kdesu", "-t"} these days, and {customCommand} in the previous line, but not an…
kfunkUnsubmitted
Done

The else branch is not needed, let it fall-through.

kfunk: The else branch is not needed, let it fall-through.
196​ {
197​ suCommand = QStringLiteral("kdesudo");
198​ break;
199​ }
200​ case 2:
201​ {
202​ suCommand = QStringLiteral("sudo");
203​ break;
204​ }
205​ default:
206​ suCommand = QStringLiteral("kdesu");
207​ }
208​
209​ builderGroup.writeEntry("Su Command", suCommand);
210​ //so that suCommandIsDigit becomes false next time
211​ //project is opened.
192 } 212​ }
213​
214​ QRegExp regEx(" ");
215​ suCommandWithArg = suCommand.split(regEx);
216​ if( suCommandWithArg.isEmpty() )
217​ {
218​ suCommandWithArg << QStringLiteral("kdesu") << QStringLiteral("-t");
219​ }
220​
221​ return suCommandWithArg;
193 } 222​ }
194 return QStringList(); 223​ return QStringList();
195} 224​}
Context not available.