author | drw <drw> | 2005-01-02 20:26:01 (UTC) |
---|---|---|
committer | drw <drw> | 2005-01-02 20:26:01 (UTC) |
commit | e763e0cea060ae3a2dfb1c411f56354e27ac12a9 (patch) (unidiff) | |
tree | 37896734be7d2679c3f19635fe9fe3b52a549332 /noncore/settings | |
parent | 020ea2d54bcd0fc4420cb433b3e657cd13ae07e2 (diff) | |
download | opie-e763e0cea060ae3a2dfb1c411f56354e27ac12a9.zip opie-e763e0cea060ae3a2dfb1c411f56354e27ac12a9.tar.gz opie-e763e0cea060ae3a2dfb1c411f56354e27ac12a9.tar.bz2 |
Implement native package linking code (removing need for ipkg-link and its shortcomings), move package linking code to OIpkg (proper place for ipkg specific code), many small code tweaks and bump version up to 0.6.1
-rw-r--r-- | noncore/settings/packagemanager/ChangeLog | 7 | ||||
-rw-r--r-- | noncore/settings/packagemanager/TODO | 8 | ||||
-rw-r--r-- | noncore/settings/packagemanager/installdlg.cpp | 81 | ||||
-rw-r--r-- | noncore/settings/packagemanager/installdlg.h | 11 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 208 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkg.h | 20 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.cpp | 34 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkgconfigdlg.h | 3 | ||||
-rw-r--r-- | noncore/settings/packagemanager/opackagemanager.cpp | 20 | ||||
-rw-r--r-- | noncore/settings/packagemanager/opie-packagemanager.control | 4 | ||||
-rw-r--r-- | noncore/settings/packagemanager/packageinfodlg.cpp | 10 | ||||
-rw-r--r-- | noncore/settings/packagemanager/packageinfodlg.h | 4 |
12 files changed, 237 insertions, 173 deletions
diff --git a/noncore/settings/packagemanager/ChangeLog b/noncore/settings/packagemanager/ChangeLog index c776ce5..608cd98 100644 --- a/noncore/settings/packagemanager/ChangeLog +++ b/noncore/settings/packagemanager/ChangeLog | |||
@@ -1,2 +1,9 @@ | |||
1 | 2005-01-02 Dan Williams <drw@handhelds.org> | ||
2 | |||
3 | * Released version 0.6.1 | ||
4 | * Implemented native package linking code to remove need for ipkg-link | ||
5 | * Implement package in OIpkg (removed from InstallDlg) as this is ipkg specific | ||
6 | * Many small code tweaks | ||
7 | |||
1 | 2004-12-21 Dan Williams <drw@handhelds.org> | 8 | 2004-12-21 Dan Williams <drw@handhelds.org> |
2 | 9 | ||
diff --git a/noncore/settings/packagemanager/TODO b/noncore/settings/packagemanager/TODO index 744ad95..2512624 100644 --- a/noncore/settings/packagemanager/TODO +++ b/noncore/settings/packagemanager/TODO | |||
@@ -3,5 +3,5 @@ | |||
3 | /* Opie - Package Manager | 3 | /* Opie - Package Manager |
4 | /* ======================== | 4 | /* ======================== |
5 | /* Version 0.6.0 | 5 | /* Version 0.6.1 |
6 | /* | 6 | /* |
7 | /* A package management client for Opie | 7 | /* A package management client for Opie |
@@ -10,8 +10,6 @@ | |||
10 | 10 | ||
11 | ----------------------------------------------- | 11 | ----------------------------------------------- |
12 | To-do for Opie-PackageManager - December, 2004 | 12 | To-do for Opie-PackageManager - January, 2005 |
13 | ----------------------------------------------- | 13 | ----------------------------------------------- |
14 | 14 | ||
15 | 1. Move ipkg-link code from InstallDlg to OIpkg | 15 | 1. Re-work package download dialog |
16 | 2. Code ipkg-link logic directly in OIpkg | ||
17 | 3. Re-work package download dialog | ||
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp index 985e2bd..7dea591 100644 --- a/noncore/settings/packagemanager/installdlg.cpp +++ b/noncore/settings/packagemanager/installdlg.cpp | |||
@@ -31,5 +31,4 @@ _;:, .> :=|. This file is free software; you can | |||
31 | 31 | ||
32 | #include <opie2/ofiledialog.h> | 32 | #include <opie2/ofiledialog.h> |
33 | #include <opie2/oprocess.h> | ||
34 | 33 | ||
35 | #include <qpe/fileselector.h> | 34 | #include <qpe/fileselector.h> |
@@ -248,85 +247,9 @@ void InstallDlg::slotBtnStart() | |||
248 | } | 247 | } |
249 | 248 | ||
250 | Opie::Core::OProcess process( this ); | ||
251 | for ( m_currCommand = 0; m_currCommand < m_numCommands; m_currCommand++ ) | 249 | for ( m_currCommand = 0; m_currCommand < m_numCommands; m_currCommand++ ) |
252 | { | 250 | { |
253 | // Execute next command | 251 | // Execute next command |
254 | m_packman->executeCommand( m_command[ m_currCommand ], m_packages[ m_currCommand ], dest, | 252 | m_packman->executeCommand( m_command[ m_currCommand ], m_packages[ m_currCommand ], dest, |
255 | this, SLOT(slotOutput(char*)), true ); | 253 | this, SLOT(slotOutput(const QString &)), true ); |
256 | |||
257 | if ( m_command[ m_currCommand ] == OPackage::Remove ) | ||
258 | { | ||
259 | // Unlink application if the package was removed | ||
260 | |||
261 | // Loop through all package names in the command group | ||
262 | for ( QStringList::Iterator it = m_packages[ m_currCommand ].begin(); | ||
263 | it != m_packages[ m_currCommand ].end(); | ||
264 | ++it ) | ||
265 | { | ||
266 | OPackage *currPackage = m_packman->findPackage( (*it) ); | ||
267 | |||
268 | // Skip package if it is not found or being removed from 'root' | ||
269 | if ( !currPackage || ( m_command[ m_currCommand ] == OPackage::Remove && | ||
270 | currPackage->destination() == "root" ) ) | ||
271 | continue; | ||
272 | |||
273 | // Display feedback to user | ||
274 | m_output->append( tr( QString( "Running ipkg-link to remove links for package '%1'." ) | ||
275 | .arg( currPackage->name() ) ) ); | ||
276 | m_output->setCursorPosition( m_output->numLines(), 0 ); | ||
277 | |||
278 | // Execute ipkg-link | ||
279 | process.clearArguments(); | ||
280 | process << "ipkg-link" | ||
281 | << ( ( m_command[ m_currCommand ] == OPackage::Install ) ? "add" : "remove" ) | ||
282 | << currPackage->name(); | ||
283 | if ( !process.start( Opie::Core::OProcess::Block, | ||
284 | Opie::Core::OProcess::NoCommunication ) ) | ||
285 | { | ||
286 | slotProcessDone( 0l ); | ||
287 | m_output->append( tr( "Unable to run ipkg-link." ) ); | ||
288 | m_output->setCursorPosition( m_output->numLines(), 0 ); | ||
289 | return; | ||
290 | } | ||
291 | } | ||
292 | } | ||
293 | else if ( m_command[ m_currCommand ] == OPackage::Install && dest != "root" ) | ||
294 | { | ||
295 | // Link applications in the destination directory | ||
296 | |||
297 | m_output->append( tr( "Running ipkg-link to link packages in '%1'." ).arg( dest ) ); | ||
298 | m_output->setCursorPosition( m_output->numLines(), 0 ); | ||
299 | |||
300 | QString destPath; | ||
301 | OConfItem *destItem = m_packman->findConfItem( OConfItem::Destination, dest ); | ||
302 | |||
303 | // Execute ipkg-link | ||
304 | process.clearArguments(); | ||
305 | process << "ipkg-link" | ||
306 | << "mount" | ||
307 | << destItem->value(); | ||
308 | if ( !process.start( Opie::Core::OProcess::Block, | ||
309 | Opie::Core::OProcess::NoCommunication ) ) | ||
310 | { | ||
311 | slotProcessDone( 0l ); | ||
312 | m_output->append( tr( "Unable to run ipkg-link." ) ); | ||
313 | m_output->setCursorPosition( m_output->numLines(), 0 ); | ||
314 | return; | ||
315 | } | ||
316 | } | ||
317 | } | ||
318 | |||
319 | slotProcessDone( 0l ); | ||
320 | } | ||
321 | |||
322 | void InstallDlg::slotProcessDone( Opie::Core::OProcess *proc ) | ||
323 | { | ||
324 | if ( proc ) | ||
325 | { | ||
326 | // Display message pnly if linking was done | ||
327 | m_output->append( tr( "The package linking is done." ) ); | ||
328 | m_output->setCursorPosition( m_output->numLines(), 0 ); | ||
329 | |||
330 | delete proc; | ||
331 | } | 254 | } |
332 | 255 | ||
@@ -373,5 +296,5 @@ void InstallDlg::slotBtnOptions() | |||
373 | } | 296 | } |
374 | 297 | ||
375 | void InstallDlg::slotOutput( char *msg ) | 298 | void InstallDlg::slotOutput( const QString &msg ) |
376 | { | 299 | { |
377 | // Allow processing of other events | 300 | // Allow processing of other events |
diff --git a/noncore/settings/packagemanager/installdlg.h b/noncore/settings/packagemanager/installdlg.h index 7a64fe0..e633809 100644 --- a/noncore/settings/packagemanager/installdlg.h +++ b/noncore/settings/packagemanager/installdlg.h | |||
@@ -43,12 +43,4 @@ class OConfItem; | |||
43 | class OPackageManager; | 43 | class OPackageManager; |
44 | 44 | ||
45 | namespace Opie | ||
46 | { | ||
47 | namespace Core | ||
48 | { | ||
49 | class OProcess; | ||
50 | } | ||
51 | } | ||
52 | |||
53 | class InstallDlg : public QWidget | 45 | class InstallDlg : public QWidget |
54 | { | 46 | { |
@@ -90,8 +82,7 @@ private slots: | |||
90 | void slotBtnStart(); | 82 | void slotBtnStart(); |
91 | void slotBtnOptions(); | 83 | void slotBtnOptions(); |
92 | void slotProcessDone( Opie::Core::OProcess *proc ); | ||
93 | 84 | ||
94 | // Execution slots | 85 | // Execution slots |
95 | void slotOutput( char *msg ); | 86 | void slotOutput( const QString &msg ); |
96 | 87 | ||
97 | signals: | 88 | signals: |
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index a66bd51..f2d7e39 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp | |||
@@ -37,4 +37,5 @@ _;:, .> :=|. This program is free software; you can | |||
37 | 37 | ||
38 | #include <stdlib.h> | 38 | #include <stdlib.h> |
39 | #include <unistd.h> | ||
39 | 40 | ||
40 | const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file | 41 | const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file |
@@ -42,4 +43,5 @@ const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondar | |||
42 | const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists | 43 | const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists |
43 | const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location | 44 | const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location |
45 | const QString IPKG_INFO_PATH = "usr/lib/ipkg/info"; // Package file lists location | ||
44 | 46 | ||
45 | OIpkg *oipkg; | 47 | OIpkg *oipkg; |
@@ -49,4 +51,5 @@ OIpkg *oipkg; | |||
49 | int fsignalIpkgMessage( ipkg_conf_t *conf, message_level_t level, char *msg ) | 51 | int fsignalIpkgMessage( ipkg_conf_t *conf, message_level_t level, char *msg ) |
50 | { | 52 | { |
53 | // Display message only if it is below the message level threshold | ||
51 | if ( conf && ( conf->verbosity < level ) ) | 54 | if ( conf && ( conf->verbosity < level ) ) |
52 | return 0; | 55 | return 0; |
@@ -59,5 +62,5 @@ int fsignalIpkgMessage( ipkg_conf_t *conf, message_level_t level, char *msg ) | |||
59 | char *fIpkgResponse( char */*question*/ ) | 62 | char *fIpkgResponse( char */*question*/ ) |
60 | { | 63 | { |
61 | return 0x0; | 64 | return 0l; |
62 | } | 65 | } |
63 | 66 | ||
@@ -82,4 +85,5 @@ OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) | |||
82 | , m_ipkgExecVerbosity( 1 ) | 85 | , m_ipkgExecVerbosity( 1 ) |
83 | { | 86 | { |
87 | // Keep pointer to self for the Ipkg callback functions | ||
84 | oipkg = this; | 88 | oipkg = this; |
85 | 89 | ||
@@ -363,4 +367,22 @@ OPackageList *OIpkg::installedPackages( const QString &destName, const QString & | |||
363 | } | 367 | } |
364 | 368 | ||
369 | OConfItem *OIpkg::findConfItem( OConfItem::Type type, const QString &name ) | ||
370 | { | ||
371 | // Find configuration item in list | ||
372 | OConfItemListIterator configIt( *m_confInfo ); | ||
373 | OConfItem *config = 0l; | ||
374 | for ( ; configIt.current(); ++configIt ) | ||
375 | { | ||
376 | config = configIt.current(); | ||
377 | if ( config->type() == type && config->name() == name ) | ||
378 | break; | ||
379 | } | ||
380 | |||
381 | if ( config && config->type() == type && config->name() == name ) | ||
382 | return config; | ||
383 | |||
384 | return 0l; | ||
385 | } | ||
386 | |||
365 | bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶meters, const QString &destination, | 387 | bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶meters, const QString &destination, |
366 | const QObject *receiver, const char *slotOutput, bool rawOutput ) | 388 | const QObject *receiver, const char *slotOutput, bool rawOutput ) |
@@ -385,14 +407,9 @@ bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶me | |||
385 | } | 407 | } |
386 | else | 408 | else |
387 | m_ipkgArgs.dest = 0x0; | 409 | m_ipkgArgs.dest = 0l; |
388 | 410 | ||
389 | // Connect output signal to widget | 411 | // Connect output signal to widget |
390 | 412 | ||
391 | if ( rawOutput ) | 413 | if ( !rawOutput ) |
392 | { | ||
393 | // if ( slotOutput ) | ||
394 | // connect( this, SIGNAL(signalIpkgMessage(char*)), receiver, slotOutput ); | ||
395 | } | ||
396 | else | ||
397 | { | 414 | { |
398 | // TODO - connect to local slot and parse output before emitting signalIpkgMessage | 415 | // TODO - connect to local slot and parse output before emitting signalIpkgMessage |
@@ -402,31 +419,51 @@ bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶me | |||
402 | { | 419 | { |
403 | case OPackage::Update : { | 420 | case OPackage::Update : { |
404 | connect( this, SIGNAL(signalIpkgMessage(char*)), receiver, slotOutput ); | 421 | connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); |
405 | ipkg_lists_update( &m_ipkgArgs ); | 422 | ipkg_lists_update( &m_ipkgArgs ); |
406 | }; | 423 | }; |
407 | break; | 424 | break; |
408 | case OPackage::Upgrade : { | 425 | case OPackage::Upgrade : { |
409 | connect( this, SIGNAL(signalIpkgMessage(char*)), receiver, slotOutput ); | 426 | connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); |
410 | ipkg_packages_upgrade( &m_ipkgArgs ); | 427 | ipkg_packages_upgrade( &m_ipkgArgs ); |
428 | |||
429 | // Re-link non-root destinations to make sure everything is in sync | ||
430 | OConfItemList *destList = destinations(); | ||
431 | OConfItemListIterator it( *destList ); | ||
432 | for ( ; it.current(); ++it ) | ||
433 | { | ||
434 | OConfItem *dest = it.current(); | ||
435 | if ( dest->name() != "root" ) | ||
436 | linkPackageDir( dest->name() ); | ||
437 | } | ||
438 | delete destList; | ||
411 | }; | 439 | }; |
412 | break; | 440 | break; |
413 | case OPackage::Install : { | 441 | case OPackage::Install : { |
414 | connect( this, SIGNAL(signalIpkgMessage(char*)), receiver, slotOutput ); | 442 | connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); |
415 | for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) | 443 | for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) |
416 | { | 444 | { |
417 | ipkg_packages_install( &m_ipkgArgs, (*it) ); | 445 | ipkg_packages_install( &m_ipkgArgs, (*it) ); |
418 | } | 446 | } |
447 | if ( destination != "root" ) | ||
448 | linkPackageDir( destination ); | ||
419 | }; | 449 | }; |
420 | break; | 450 | break; |
421 | case OPackage::Remove : { | 451 | case OPackage::Remove : { |
422 | connect( this, SIGNAL(signalIpkgMessage(char*)), receiver, slotOutput ); | 452 | connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); |
453 | |||
454 | // Get list of destinations for unlinking of packages not installed to root | ||
455 | OConfItemList *destList = destinations(); | ||
456 | |||
423 | for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) | 457 | for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) |
424 | { | 458 | { |
459 | unlinkPackage( (*it), destList ); | ||
425 | ipkg_packages_remove( &m_ipkgArgs, (*it), true ); | 460 | ipkg_packages_remove( &m_ipkgArgs, (*it), true ); |
426 | } | 461 | } |
462 | |||
463 | delete destList; | ||
427 | }; | 464 | }; |
428 | break; | 465 | break; |
429 | case OPackage::Download : { | 466 | case OPackage::Download : { |
430 | connect( this, SIGNAL(signalIpkgMessage(char*)), receiver, slotOutput ); | 467 | connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); |
431 | for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) | 468 | for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) |
432 | { | 469 | { |
@@ -436,11 +473,11 @@ bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶me | |||
436 | break; | 473 | break; |
437 | case OPackage::Info : { | 474 | case OPackage::Info : { |
438 | connect( this, SIGNAL(signalIpkgStatus(char*)), receiver, slotOutput ); | 475 | connect( this, SIGNAL(signalIpkgStatus(const QString &)), receiver, slotOutput ); |
439 | ipkg_packages_info( &m_ipkgArgs, (*parameters.begin()), &fIpkgStatus, 0x0 ); | 476 | ipkg_packages_info( &m_ipkgArgs, (*parameters.begin()), &fIpkgStatus, 0l ); |
440 | }; | 477 | }; |
441 | break; | 478 | break; |
442 | case OPackage::Files : { | 479 | case OPackage::Files : { |
443 | connect( this, SIGNAL(signalIpkgList(char*)), receiver, slotOutput ); | 480 | connect( this, SIGNAL(signalIpkgList(const QString &)), receiver, slotOutput ); |
444 | ipkg_package_files( &m_ipkgArgs, (*parameters.begin()), &fIpkgFiles, 0x0 ); | 481 | ipkg_package_files( &m_ipkgArgs, (*parameters.begin()), &fIpkgFiles, 0l ); |
445 | }; | 482 | }; |
446 | break; | 483 | break; |
@@ -590,2 +627,139 @@ OConfItemList *OIpkg::filterConfItems( OConfItem::Type typefilter ) | |||
590 | return sl; | 627 | return sl; |
591 | } | 628 | } |
629 | |||
630 | const QString &OIpkg::rootPath() | ||
631 | { | ||
632 | if ( m_rootPath.isEmpty() ) | ||
633 | { | ||
634 | OConfItem *rootDest = findConfItem( OConfItem::Destination, "root" ); | ||
635 | rootDest ? m_rootPath = rootDest->value() | ||
636 | : m_rootPath = '/'; | ||
637 | if ( m_rootPath.right( 1 ) == '/' ) | ||
638 | m_rootPath.truncate( m_rootPath.length() - 1 ); | ||
639 | } | ||
640 | return m_rootPath; | ||
641 | } | ||
642 | |||
643 | void OIpkg::linkPackageDir( const QString &dest ) | ||
644 | { | ||
645 | if ( !dest.isNull() ) | ||
646 | { | ||
647 | OConfItem *destConfItem = findConfItem( OConfItem::Destination, dest ); | ||
648 | |||
649 | emit signalIpkgMessage( tr( "Linking packages installed in: %1" ).arg( dest ) ); | ||
650 | |||
651 | // Set package destination directory | ||
652 | QString destDir = destConfItem->value(); | ||
653 | QString destInfoDir = destDir; | ||
654 | if ( destInfoDir.right( 1 ) != '/' ) | ||
655 | destInfoDir.append( '/' ); | ||
656 | destInfoDir.append( IPKG_INFO_PATH ); | ||
657 | |||
658 | // Get list of installed packages in destination | ||
659 | QDir packageDir( destInfoDir ); | ||
660 | QStringList packageFiles; | ||
661 | if ( packageDir.exists() ) | ||
662 | { | ||
663 | packageDir.setNameFilter( "*.list" ); | ||
664 | packageDir.setFilter( QDir::Files ); | ||
665 | packageFiles = packageDir.entryList( "*.list", QDir::Files ); | ||
666 | } | ||
667 | |||
668 | // Link all files for every package installed in desination | ||
669 | QStringList::Iterator lastFile = packageFiles.end(); | ||
670 | for ( QStringList::Iterator it = packageFiles.begin(); it != lastFile; ++it ) | ||
671 | { | ||
672 | //emit signalIpkgMessage( QString( "Processing: %1/%2" ).arg( destInfoDir ).arg (*it) ); | ||
673 | QString packageFileName = destInfoDir; | ||
674 | packageFileName.append( '/' ); | ||
675 | packageFileName.append( (*it) ); | ||
676 | QFile packageFile( packageFileName ); | ||
677 | if ( packageFile.open( IO_ReadOnly ) ) | ||
678 | { | ||
679 | QTextStream t( &packageFile ); | ||
680 | QString linkFile; | ||
681 | while ( !t.eof() ) | ||
682 | { | ||
683 | // Get the name of the file to link and build the sym link filename | ||
684 | linkFile = t.readLine(); | ||
685 | QString linkDest( linkFile.right( linkFile.length() - destDir.length() ) ); | ||
686 | linkDest.prepend( rootPath() ); | ||
687 | |||
688 | // If file installed file is actually symbolic link, use actual file for linking | ||
689 | QFileInfo fileInfo( linkFile ); | ||
690 | if ( fileInfo.isSymLink() && !fileInfo.readLink().isEmpty() ) | ||
691 | linkFile = fileInfo.readLink(); | ||
692 | |||
693 | // See if directory exists in 'root', if not, create | ||
694 | fileInfo.setFile( linkDest ); | ||
695 | QString linkDestDirName = fileInfo.dirPath( true ); | ||
696 | QDir linkDestDir( linkDestDirName ); | ||
697 | if ( !linkDestDir.exists() ) | ||
698 | { | ||
699 | linkDestDir.mkdir( linkDestDirName ); | ||
700 | } | ||
701 | else | ||
702 | { | ||
703 | // Remove any previous link to make sure we will be pointing to the current version | ||
704 | if ( QFile::exists( linkDest ) ) | ||
705 | QFile::remove( linkDest ); | ||
706 | } | ||
707 | |||
708 | // Link the file | ||
709 | //emit signalIpkgMessage( QString( "Linking '%1' to '%2'" ).arg( linkFile ).arg( linkDest ) ); | ||
710 | if ( symlink( linkFile, linkDest ) == -1 ) | ||
711 | emit signalIpkgMessage( tr( "Error linkling '%1' to '%2'" ) | ||
712 | .arg( linkFile ) | ||
713 | .arg( linkDest ) ); | ||
714 | } | ||
715 | packageFile.close(); | ||
716 | } | ||
717 | } | ||
718 | } | ||
719 | } | ||
720 | |||
721 | void OIpkg::unlinkPackage( const QString &package, OConfItemList *destList ) | ||
722 | { | ||
723 | if ( !package.isNull() ) | ||
724 | { | ||
725 | // Find destination package is installed in | ||
726 | if ( destList ) | ||
727 | { | ||
728 | OConfItemListIterator it( *destList ); | ||
729 | for ( ; it.current(); ++it ) | ||
730 | { | ||
731 | OConfItem *dest = it.current(); | ||
732 | QString destInfoFileName = QString( "%1/%2/%3.list" ).arg( dest->value() ) | ||
733 | .arg( IPKG_INFO_PATH ) | ||
734 | .arg( package ); | ||
735 | //emit signalIpkgMessage( QString( "Looking for '%1'" ).arg ( destInfoFileName ) ); | ||
736 | |||
737 | // If found and destination is not 'root', remove symbolic links | ||
738 | if ( QFile::exists( destInfoFileName ) && dest->name() != "root" ) | ||
739 | { | ||
740 | QFile destInfoFile( destInfoFileName ); | ||
741 | if ( destInfoFile.open( IO_ReadOnly ) ) | ||
742 | { | ||
743 | QTextStream t( &destInfoFile ); | ||
744 | QString linkFile; | ||
745 | while ( !t.eof() ) | ||
746 | { | ||
747 | // Get the name of the file to link and build the sym link filename | ||
748 | linkFile = t.readLine(); | ||
749 | QString linkDest( linkFile.right( linkFile.length() - | ||
750 | dest->value().length() ) ); | ||
751 | linkDest.prepend( rootPath() ); | ||
752 | |||
753 | //emit signalIpkgMessage( QString( "Deleting: '%1'" ).arg( linkDest ) ); | ||
754 | QFile::remove( linkDest ); | ||
755 | } | ||
756 | destInfoFile.close(); | ||
757 | } | ||
758 | |||
759 | emit signalIpkgMessage( tr( "Links removed for: %1" ).arg( package ) ); | ||
760 | return; | ||
761 | } | ||
762 | } | ||
763 | } | ||
764 | } | ||
765 | } | ||
diff --git a/noncore/settings/packagemanager/oipkg.h b/noncore/settings/packagemanager/oipkg.h index 3c96200..0263f50 100644 --- a/noncore/settings/packagemanager/oipkg.h +++ b/noncore/settings/packagemanager/oipkg.h | |||
@@ -57,5 +57,5 @@ class OIpkg : public QObject | |||
57 | 57 | ||
58 | public: | 58 | public: |
59 | OIpkg( Config *config = 0x0, QObject *parent = 0x0, const char *name = 0x0 ); | 59 | OIpkg( Config *config = 0l, QObject *parent = 0l, const char *name = 0l ); |
60 | ~OIpkg(); | 60 | ~OIpkg(); |
61 | 61 | ||
@@ -78,9 +78,12 @@ public: | |||
78 | const QString &destPath = QString::null ); | 78 | const QString &destPath = QString::null ); |
79 | 79 | ||
80 | OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined, | ||
81 | const QString &name = QString::null ); | ||
82 | |||
80 | bool executeCommand( OPackage::Command command = OPackage::NotDefined, | 83 | bool executeCommand( OPackage::Command command = OPackage::NotDefined, |
81 | const QStringList ¶meters = QStringList(), | 84 | const QStringList ¶meters = QStringList(), |
82 | const QString &destination = QString::null, | 85 | const QString &destination = QString::null, |
83 | const QObject *receiver = 0x0, | 86 | const QObject *receiver = 0l, |
84 | const char *slotOutput = 0x0, | 87 | const char *slotOutput = 0l, |
85 | bool rawOutput = true ); | 88 | bool rawOutput = true ); |
86 | void abortCommand(); | 89 | void abortCommand(); |
@@ -96,12 +99,17 @@ private: | |||
96 | int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options | 99 | int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options |
97 | int m_ipkgExecVerbosity; // Ipkg execution verbosity level | 100 | int m_ipkgExecVerbosity; // Ipkg execution verbosity level |
101 | QString m_rootPath; // Directory path where the 'root' destination is located | ||
98 | 102 | ||
99 | void loadConfiguration(); | 103 | void loadConfiguration(); |
100 | OConfItemList *filterConfItems( OConfItem::Type typefilter = OConfItem::NotDefined ); | 104 | OConfItemList *filterConfItems( OConfItem::Type typefilter = OConfItem::NotDefined ); |
105 | const QString &rootPath(); | ||
106 | void linkPackageDir( const QString &dest = QString::null ); | ||
107 | void unlinkPackage( const QString &package = QString::null, | ||
108 | OConfItemList *destList = 0l ); | ||
101 | 109 | ||
102 | signals: | 110 | signals: |
103 | void signalIpkgMessage( char *msg ); | 111 | void signalIpkgMessage( const QString &msg ); |
104 | void signalIpkgStatus( char *status ); | 112 | void signalIpkgStatus( const QString &status ); |
105 | void signalIpkgList( char *filelist ); | 113 | void signalIpkgList( const QString &filelist ); |
106 | }; | 114 | }; |
107 | 115 | ||
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp index 77ad220..e6d6a81 100644 --- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp +++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp | |||
@@ -93,5 +93,5 @@ void OIpkgConfigDlg::accept() | |||
93 | { | 93 | { |
94 | // Update proxy information before saving settings | 94 | // Update proxy information before saving settings |
95 | OConfItem *confItem = findConfItem( OConfItem::Option, "http_proxy" ); | 95 | OConfItem *confItem = m_ipkg->findConfItem( OConfItem::Option, "http_proxy" ); |
96 | if ( confItem ) | 96 | if ( confItem ) |
97 | { | 97 | { |
@@ -104,5 +104,5 @@ void OIpkgConfigDlg::accept() | |||
104 | m_proxyHttpActive->isChecked() ) ); | 104 | m_proxyHttpActive->isChecked() ) ); |
105 | 105 | ||
106 | confItem = findConfItem( OConfItem::Option, "ftp_proxy" ); | 106 | confItem = m_ipkg->findConfItem( OConfItem::Option, "ftp_proxy" ); |
107 | if ( confItem ) | 107 | if ( confItem ) |
108 | { | 108 | { |
@@ -115,5 +115,5 @@ void OIpkgConfigDlg::accept() | |||
115 | m_proxyFtpActive->isChecked() ) ); | 115 | m_proxyFtpActive->isChecked() ) ); |
116 | 116 | ||
117 | confItem = findConfItem( OConfItem::Option, "proxy_username" ); | 117 | confItem = m_ipkg->findConfItem( OConfItem::Option, "proxy_username" ); |
118 | if ( confItem ) | 118 | if ( confItem ) |
119 | confItem->setValue( m_proxyUsername->text() ); | 119 | confItem->setValue( m_proxyUsername->text() ); |
@@ -122,5 +122,5 @@ void OIpkgConfigDlg::accept() | |||
122 | m_proxyUsername->text() ) ); | 122 | m_proxyUsername->text() ) ); |
123 | 123 | ||
124 | confItem = findConfItem( OConfItem::Option, "proxy_password" ); | 124 | confItem = m_ipkg->findConfItem( OConfItem::Option, "proxy_password" ); |
125 | if ( confItem ) | 125 | if ( confItem ) |
126 | confItem->setValue( m_proxyPassword->text() ); | 126 | confItem->setValue( m_proxyPassword->text() ); |
@@ -394,22 +394,4 @@ void OIpkgConfigDlg::initData() | |||
394 | } | 394 | } |
395 | 395 | ||
396 | OConfItem *OIpkgConfigDlg::findConfItem( OConfItem::Type type, const QString &name ) | ||
397 | { | ||
398 | // Find selected server in list | ||
399 | OConfItemListIterator configIt( *m_configs ); | ||
400 | OConfItem *config = 0l; | ||
401 | for ( ; configIt.current(); ++configIt ) | ||
402 | { | ||
403 | config = configIt.current(); | ||
404 | if ( config->type() == type && config->name() == name ) | ||
405 | break; | ||
406 | } | ||
407 | |||
408 | if ( config && config->type() == type && config->name() == name ) | ||
409 | return config; | ||
410 | |||
411 | return 0l; | ||
412 | } | ||
413 | |||
414 | void OIpkgConfigDlg::slotServerSelected( int index ) | 396 | void OIpkgConfigDlg::slotServerSelected( int index ) |
415 | { | 397 | { |
@@ -443,5 +425,5 @@ void OIpkgConfigDlg::slotServerEdit() | |||
443 | { | 425 | { |
444 | // Find selected server in list | 426 | // Find selected server in list |
445 | OConfItem *server = findConfItem( OConfItem::Source, m_serverList->currentText() ); | 427 | OConfItem *server = m_ipkg->findConfItem( OConfItem::Source, m_serverList->currentText() ); |
446 | 428 | ||
447 | // Edit server | 429 | // Edit server |
@@ -462,5 +444,5 @@ void OIpkgConfigDlg::slotServerDelete() | |||
462 | { | 444 | { |
463 | // Find selected server in list | 445 | // Find selected server in list |
464 | OConfItem *server = findConfItem( OConfItem::Source, m_serverList->currentText() ); | 446 | OConfItem *server = m_ipkg->findConfItem( OConfItem::Source, m_serverList->currentText() ); |
465 | 447 | ||
466 | // Delete server | 448 | // Delete server |
@@ -503,5 +485,5 @@ void OIpkgConfigDlg::slotDestEdit() | |||
503 | { | 485 | { |
504 | // Find selected destination in list | 486 | // Find selected destination in list |
505 | OConfItem *dest = findConfItem( OConfItem::Destination, m_destList->currentText() ); | 487 | OConfItem *dest = m_ipkg->findConfItem( OConfItem::Destination, m_destList->currentText() ); |
506 | 488 | ||
507 | // Edit destination | 489 | // Edit destination |
@@ -522,5 +504,5 @@ void OIpkgConfigDlg::slotDestDelete() | |||
522 | { | 504 | { |
523 | // Find selected destination in list | 505 | // Find selected destination in list |
524 | OConfItem *destination = findConfItem( OConfItem::Destination, m_destList->currentText() ); | 506 | OConfItem *destination = m_ipkg->findConfItem( OConfItem::Destination, m_destList->currentText() ); |
525 | 507 | ||
526 | // Delete destination | 508 | // Delete destination |
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.h b/noncore/settings/packagemanager/oipkgconfigdlg.h index 5b7e91d..0fb2e16 100644 --- a/noncore/settings/packagemanager/oipkgconfigdlg.h +++ b/noncore/settings/packagemanager/oipkgconfigdlg.h | |||
@@ -108,7 +108,4 @@ private: | |||
108 | void initData(); | 108 | void initData(); |
109 | 109 | ||
110 | OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined, | ||
111 | const QString &name = QString::null ); | ||
112 | |||
113 | private slots: | 110 | private slots: |
114 | void slotServerSelected( int index ); | 111 | void slotServerSelected( int index ); |
diff --git a/noncore/settings/packagemanager/opackagemanager.cpp b/noncore/settings/packagemanager/opackagemanager.cpp index cbddfe7..c9fdec1 100644 --- a/noncore/settings/packagemanager/opackagemanager.cpp +++ b/noncore/settings/packagemanager/opackagemanager.cpp | |||
@@ -270,23 +270,5 @@ QStringList OPackageManager::destinations() | |||
270 | OConfItem *OPackageManager::findConfItem( OConfItem::Type type, const QString &name ) | 270 | OConfItem *OPackageManager::findConfItem( OConfItem::Type type, const QString &name ) |
271 | { | 271 | { |
272 | OConfItem *confItem = 0x0; | 272 | return m_ipkg.findConfItem( type, name ); |
273 | OConfItemList *confList = m_ipkg.configItems(); | ||
274 | if ( confList ) | ||
275 | { | ||
276 | for ( OConfItemListIterator confIt( *confList ); confIt.current(); ++confIt ) | ||
277 | { | ||
278 | OConfItem *conf = confIt.current(); | ||
279 | |||
280 | // Add only active confinations | ||
281 | if ( conf->type() == type && conf->name() == name ) | ||
282 | { | ||
283 | confItem = conf; | ||
284 | break; | ||
285 | } | ||
286 | } | ||
287 | } | ||
288 | |||
289 | return confItem; | ||
290 | |||
291 | } | 273 | } |
292 | 274 | ||
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control index cdf419c..da3ddfe 100644 --- a/noncore/settings/packagemanager/opie-packagemanager.control +++ b/noncore/settings/packagemanager/opie-packagemanager.control | |||
@@ -3,8 +3,8 @@ Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/package | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg (>=0.99.120), ipkg-link | 5 | Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg (>=0.99.120) |
6 | Replaces: packagemanager | 6 | Replaces: packagemanager |
7 | Architecture: arm | 7 | Architecture: arm |
8 | Maintainer: Dan Williams (drw@handhelds.org) | 8 | Maintainer: Dan Williams (drw@handhelds.org) |
9 | Description: Opie package management client | 9 | Description: Opie package management client |
10 | Version: 0.6.0$EXTRAVERSION | 10 | Version: 0.6.1$EXTRAVERSION |
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp index 5f72a67..3eef939 100644 --- a/noncore/settings/packagemanager/packageinfodlg.cpp +++ b/noncore/settings/packagemanager/packageinfodlg.cpp | |||
@@ -77,5 +77,6 @@ PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QStr | |||
77 | // Package information is not cached, retrieve it | 77 | // Package information is not cached, retrieve it |
78 | QStringList list( package ); | 78 | QStringList list( package ); |
79 | m_packman->executeCommand( OPackage::Info, list, QString::null, this, SLOT(slotInfo(char*)), true ); | 79 | m_packman->executeCommand( OPackage::Info, list, QString::null, |
80 | this, SLOT(slotInfo(const QString &)), true ); | ||
80 | } | 81 | } |
81 | 82 | ||
@@ -129,5 +130,6 @@ void PackageInfoDlg::slotBtnFileScan() | |||
129 | 130 | ||
130 | QStringList list( m_package->name() ); | 131 | QStringList list( m_package->name() ); |
131 | m_packman->executeCommand( OPackage::Files, list, QString::null, this, SLOT(slotFiles(char*)), true ); | 132 | m_packman->executeCommand( OPackage::Files, list, QString::null, |
133 | this, SLOT(slotFiles(const QString &)), true ); | ||
132 | 134 | ||
133 | if ( m_retrieveFiles ) | 135 | if ( m_retrieveFiles ) |
@@ -135,10 +137,10 @@ void PackageInfoDlg::slotBtnFileScan() | |||
135 | } | 137 | } |
136 | 138 | ||
137 | void PackageInfoDlg::slotInfo( char *info ) | 139 | void PackageInfoDlg::slotInfo( const QString &info ) |
138 | { | 140 | { |
139 | m_information.append( info ); | 141 | m_information.append( info ); |
140 | } | 142 | } |
141 | 143 | ||
142 | void PackageInfoDlg::slotFiles( char *filelist ) | 144 | void PackageInfoDlg::slotFiles( const QString &filelist ) |
143 | { | 145 | { |
144 | QString str = filelist; | 146 | QString str = filelist; |
diff --git a/noncore/settings/packagemanager/packageinfodlg.h b/noncore/settings/packagemanager/packageinfodlg.h index d1830de..2962f9a 100644 --- a/noncore/settings/packagemanager/packageinfodlg.h +++ b/noncore/settings/packagemanager/packageinfodlg.h | |||
@@ -60,6 +60,6 @@ private: | |||
60 | private slots: | 60 | private slots: |
61 | void slotBtnFileScan(); | 61 | void slotBtnFileScan(); |
62 | void slotInfo( char *info ); | 62 | void slotInfo( const QString &info ); |
63 | void slotFiles( char *filelist ); | 63 | void slotFiles( const QString &filelist ); |
64 | }; | 64 | }; |
65 | 65 | ||