Diffstat (limited to 'noncore/settings/packagemanager/oipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index ffb3687..38cd824 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp | |||
@@ -401,48 +401,50 @@ OConfItem *OIpkg::findConfItem( OConfItem::Type type, const QString &name ) | |||
401 | for ( ; configIt.current(); ++configIt ) | 401 | for ( ; configIt.current(); ++configIt ) |
402 | { | 402 | { |
403 | config = configIt.current(); | 403 | config = configIt.current(); |
404 | if ( config->type() == type && config->name() == name ) | 404 | if ( config->type() == type && config->name() == name ) |
405 | break; | 405 | break; |
406 | } | 406 | } |
407 | 407 | ||
408 | if ( config && config->type() == type && config->name() == name ) | 408 | if ( config && config->type() == type && config->name() == name ) |
409 | return config; | 409 | return config; |
410 | 410 | ||
411 | return 0l; | 411 | return 0l; |
412 | } | 412 | } |
413 | 413 | ||
414 | bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶meters, const QString &destination, | 414 | bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶meters, const QString &destination, |
415 | const QObject *receiver, const char *slotOutput, bool rawOutput ) | 415 | const QObject *receiver, const char *slotOutput, bool rawOutput ) |
416 | { | 416 | { |
417 | if ( command == OPackage::NotDefined ) | 417 | if ( command == OPackage::NotDefined ) |
418 | return false; | 418 | return false; |
419 | 419 | ||
420 | // Set ipkg run-time options/arguments | 420 | // Set ipkg run-time options/arguments |
421 | m_ipkgArgs.force_depends = ( m_ipkgExecOptions & FORCE_DEPENDS ); | 421 | m_ipkgArgs.force_depends = ( m_ipkgExecOptions & FORCE_DEPENDS ); |
422 | m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); | 422 | m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); |
423 | // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); | 423 | // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); |
424 | m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); | 424 | m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); |
425 | m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE ); | ||
426 | m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET ); | ||
425 | m_ipkgArgs.verbosity = m_ipkgExecVerbosity; | 427 | m_ipkgArgs.verbosity = m_ipkgExecVerbosity; |
426 | if ( m_ipkgArgs.dest ) | 428 | if ( m_ipkgArgs.dest ) |
427 | free( m_ipkgArgs.dest ); | 429 | free( m_ipkgArgs.dest ); |
428 | if ( !destination.isNull() ) | 430 | if ( !destination.isNull() ) |
429 | { | 431 | { |
430 | int len = destination.length() + 1; | 432 | int len = destination.length() + 1; |
431 | m_ipkgArgs.dest = (char *)malloc( len ); | 433 | m_ipkgArgs.dest = (char *)malloc( len ); |
432 | strncpy( m_ipkgArgs.dest, destination, destination.length() ); | 434 | strncpy( m_ipkgArgs.dest, destination, destination.length() ); |
433 | m_ipkgArgs.dest[ len - 1 ] = '\0'; | 435 | m_ipkgArgs.dest[ len - 1 ] = '\0'; |
434 | } | 436 | } |
435 | else | 437 | else |
436 | m_ipkgArgs.dest = 0l; | 438 | m_ipkgArgs.dest = 0l; |
437 | 439 | ||
438 | // Connect output signal to widget | 440 | // Connect output signal to widget |
439 | 441 | ||
440 | if ( !rawOutput ) | 442 | if ( !rawOutput ) |
441 | { | 443 | { |
442 | // TODO - connect to local slot and parse output before emitting signalIpkgMessage | 444 | // TODO - connect to local slot and parse output before emitting signalIpkgMessage |
443 | } | 445 | } |
444 | 446 | ||
445 | switch( command ) | 447 | switch( command ) |
446 | { | 448 | { |
447 | case OPackage::Update : { | 449 | case OPackage::Update : { |
448 | connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); | 450 | connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); |