summaryrefslogtreecommitdiff
authordrw <drw>2005-01-04 15:27:01 (UTC)
committer drw <drw>2005-01-04 15:27:01 (UTC)
commit653ffebd614ef90bc5524fdf910776d4af0a48a7 (patch) (unidiff)
treeab9d9771466d2fc8e3f06b50731dcffa0925a503
parenta63d6d1896bcb6f1ac3b041e3d46edf0ec9e8082 (diff)
downloadopie-653ffebd614ef90bc5524fdf910776d4af0a48a7.zip
opie-653ffebd614ef90bc5524fdf910776d4af0a48a7.tar.gz
opie-653ffebd614ef90bc5524fdf910776d4af0a48a7.tar.bz2
Undo previous commit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/oconfitem.h7
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp7
-rw-r--r--noncore/settings/packagemanager/opie-packagemanager.control4
3 files changed, 5 insertions, 13 deletions
diff --git a/noncore/settings/packagemanager/oconfitem.h b/noncore/settings/packagemanager/oconfitem.h
index 7b52ce4..9972c00 100644
--- a/noncore/settings/packagemanager/oconfitem.h
+++ b/noncore/settings/packagemanager/oconfitem.h
@@ -1,101 +1,96 @@
1/* 1/*
2 This file is part of the Opie Project 2 This file is part of the Opie Project
3 3
4 Copyright (c) 2003 Dan Williams <drw@handhelds.org> 4 Copyright (c) 2003 Dan Williams <drw@handhelds.org>
5 =. 5 =.
6 .=l. 6 .=l.
7 .>+-= 7 .>+-=
8_;:, .> :=|. This program is free software; you can 8_;:, .> :=|. This program is free software; you can
9.> <`_, > . <= redistribute it and/or modify it under 9.> <`_, > . <= redistribute it and/or modify it under
10:`=1 )Y*s>-.-- : the terms of the GNU Library General Public 10:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
11.="- .-=="i, .._ License as published by the Free Software 11.="- .-=="i, .._ License as published by the Free Software
12- . .-<_> .<> Foundation; either version 2 of the License, 12- . .-<_> .<> Foundation; either version 2 of the License,
13 ._= =} : or (at your option) any later version. 13 ._= =} : or (at your option) any later version.
14 .%`+i> _;_. 14 .%`+i> _;_.
15 .i_,=:_. -<s. This program is distributed in the hope that 15 .i_,=:_. -<s. This program is distributed in the hope that
16 + . -:. = it will be useful, but WITHOUT ANY WARRANTY; 16 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
17 : .. .:, . . . without even the implied warranty of 17 : .. .:, . . . without even the implied warranty of
18 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A 18 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
19 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU 19 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.= = ; Library General Public License for more 20..}^=.= = ; Library General Public License for more
21++= -. .` .: details. 21++= -. .` .: details.
22: = ...= . :.=- 22: = ...= . :.=-
23-. .:....=;==+<; You should have received a copy of the GNU 23-. .:....=;==+<; You should have received a copy of the GNU
24 -_. . . )=. = Library General Public License along with 24 -_. . . )=. = Library General Public License along with
25 -- :-=` this library; see the file COPYING.LIB. 25 -- :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation, 26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 28 Boston, MA 02111-1307, USA.
29 29
30*/ 30*/
31 31
32#ifndef OCONFITEM_H 32#ifndef OCONFITEM_H
33#define OCONFITEM_H 33#define OCONFITEM_H
34 34
35#include <qlist.h> 35#include <qlist.h>
36#include <qstring.h> 36#include <qstring.h>
37 37
38class OConfItem 38class OConfItem
39{ 39{
40public: 40public:
41 enum Type { Source=0x01, 41 enum Type { Source, Destination, Option, Arch, NotDefined };
42 GzSource=0x02,
43 Destination=0x04,
44 Option=0x08,
45 Arch=0x10,
46 NotDefined=0x20 };
47 42
48 OConfItem( Type type = NotDefined, const QString &name = QString::null, 43 OConfItem( Type type = NotDefined, const QString &name = QString::null,
49 const QString &value = QString::null, const QString &features = QString::null, 44 const QString &value = QString::null, const QString &features = QString::null,
50 bool active = true ); 45 bool active = true );
51 46
52 Type type() { return m_type; } 47 Type type() { return m_type; }
53 const QString &name() { return m_name; } 48 const QString &name() { return m_name; }
54 const QString &value() { return m_value; } 49 const QString &value() { return m_value; }
55 const QString &features() { return m_features; } 50 const QString &features() { return m_features; }
56 bool active() { return m_active; } 51 bool active() { return m_active; }
57 52
58 void setType( Type type ) { m_type = type; } 53 void setType( Type type ) { m_type = type; }
59 void setName( const QString &name ) { m_name = name; } 54 void setName( const QString &name ) { m_name = name; }
60 void setValue( const QString &value ) { m_value = value; } 55 void setValue( const QString &value ) { m_value = value; }
61 void setFeatures( const QString &features ) { m_features = features; } 56 void setFeatures( const QString &features ) { m_features = features; }
62 void setActive( bool active ) { m_active = active; } 57 void setActive( bool active ) { m_active = active; }
63 58
64private: 59private:
65 Type m_type; // Type of configuration item 60 Type m_type; // Type of configuration item
66 QString m_name; // Name of item 61 QString m_name; // Name of item
67 QString m_value; // Value of item 62 QString m_value; // Value of item
68 QString m_features; // Comma-deliminated list of features this item supports 63 QString m_features; // Comma-deliminated list of features this item supports
69 bool m_active; // Indicates whether item is currently active 64 bool m_active; // Indicates whether item is currently active
70}; 65};
71 66
72class OConfItemList : public QList<OConfItem> 67class OConfItemList : public QList<OConfItem>
73{ 68{
74private: 69private:
75 70
76 int compareItems( QCollection::Item item1, QCollection::Item item2 ) 71 int compareItems( QCollection::Item item1, QCollection::Item item2 )
77 { 72 {
78 // Sort by OConfItem location then by type 73 // Sort by OConfItem location then by type
79 OConfItem::Type type1 = reinterpret_cast<OConfItem*>(item1)->type(); 74 OConfItem::Type type1 = reinterpret_cast<OConfItem*>(item1)->type();
80 OConfItem::Type type2 = reinterpret_cast<OConfItem*>(item2)->type(); 75 OConfItem::Type type2 = reinterpret_cast<OConfItem*>(item2)->type();
81 if ( type1 < type2 ) 76 if ( type1 < type2 )
82 return -1; 77 return -1;
83 else if ( type1 == type2 ) 78 else if ( type1 == type2 )
84 { 79 {
85 QString name1 = reinterpret_cast<OConfItem*>(item1)->name(); 80 QString name1 = reinterpret_cast<OConfItem*>(item1)->name();
86 QString name2 = reinterpret_cast<OConfItem*>(item2)->name(); 81 QString name2 = reinterpret_cast<OConfItem*>(item2)->name();
87 if ( name1 < name2 ) 82 if ( name1 < name2 )
88 return -1; 83 return -1;
89 else if ( name1 == name2 ) 84 else if ( name1 == name2 )
90 return 0; 85 return 0;
91 else /*if ( name1 > name2 )*/ 86 else /*if ( name1 > name2 )*/
92 return 1; 87 return 1;
93 } 88 }
94 else /*if ( type1 > type2 )*/ 89 else /*if ( type1 > type2 )*/
95 return 1; 90 return 1;
96 } 91 }
97}; 92};
98 93
99typedef QListIterator<OConfItem> OConfItemListIterator; 94typedef QListIterator<OConfItem> OConfItemListIterator;
100 95
101#endif 96#endif
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index a885ef8..f2d7e39 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -53,130 +53,129 @@ int fsignalIpkgMessage( ipkg_conf_t *conf, message_level_t level, char *msg )
53 // Display message only if it is below the message level threshold 53 // Display message only if it is below the message level threshold
54 if ( conf && ( conf->verbosity < level ) ) 54 if ( conf && ( conf->verbosity < level ) )
55 return 0; 55 return 0;
56 else 56 else
57 oipkg->ipkgMessage( msg ); 57 oipkg->ipkgMessage( msg );
58 58
59 return 0; 59 return 0;
60} 60}
61 61
62char *fIpkgResponse( char */*question*/ ) 62char *fIpkgResponse( char */*question*/ )
63{ 63{
64 return 0l; 64 return 0l;
65} 65}
66 66
67int fIpkgStatus( char */*name*/, int /*status*/, char *desc, void */*userdata*/ ) 67int fIpkgStatus( char */*name*/, int /*status*/, char *desc, void */*userdata*/ )
68{ 68{
69 oipkg->ipkgStatus( desc ); 69 oipkg->ipkgStatus( desc );
70 return 0; 70 return 0;
71} 71}
72 72
73int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/, 73int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/,
74 void */*userdata*/ ) 74 void */*userdata*/ )
75{ 75{
76 oipkg->ipkgList( desc ); 76 oipkg->ipkgList( desc );
77 return 0; 77 return 0;
78} 78}
79 79
80OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) 80OIpkg::OIpkg( Config *config, QObject *parent, const char *name )
81 : QObject( parent, name ) 81 : QObject( parent, name )
82 , m_config( config ) 82 , m_config( config )
83 , m_confInfo( NULL ) 83 , m_confInfo( NULL )
84 , m_ipkgExecOptions( 0 ) 84 , m_ipkgExecOptions( 0 )
85 , m_ipkgExecVerbosity( 1 ) 85 , m_ipkgExecVerbosity( 1 )
86{ 86{
87 // Keep pointer to self for the Ipkg callback functions 87 // Keep pointer to self for the Ipkg callback functions
88 oipkg = this; 88 oipkg = this;
89 89
90 // Initialize libipkg 90 // Initialize libipkg
91 ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ); 91 ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs );
92 92
93 // Default ipkg run-time arguments 93 // Default ipkg run-time arguments
94 m_ipkgArgs.noaction = false; 94 m_ipkgArgs.noaction = false;
95 m_ipkgArgs.force_defaults = true; 95 m_ipkgArgs.force_defaults = true;
96} 96}
97 97
98OIpkg::~OIpkg() 98OIpkg::~OIpkg()
99{ 99{
100 // Upon destruction, ensure that items in config list are deleted with list 100 // Upon destruction, ensure that items in config list are deleted with list
101 if ( m_confInfo ) 101 if ( m_confInfo )
102 m_confInfo->setAutoDelete( true ); 102 m_confInfo->setAutoDelete( true );
103 103
104 // Free up libipkg resources 104 // Free up libipkg resources
105 ipkg_deinit( &m_ipkgArgs ); 105 ipkg_deinit( &m_ipkgArgs );
106} 106}
107 107
108OConfItemList *OIpkg::configItems() 108OConfItemList *OIpkg::configItems()
109{ 109{
110 // Retrieve all configuration items 110 // Retrieve all configuration items
111 return filterConfItems(); 111 return filterConfItems();
112} 112}
113 113
114OConfItemList *OIpkg::servers() 114OConfItemList *OIpkg::servers()
115{ 115{
116 // Retrieve only servers 116 // Retrieve only servers
117 return filterConfItems( (OConfItem::Type)((int)OConfItem::Source | 117 return filterConfItems( OConfItem::Source );
118 (int)OConfItem::GzSource) );
119} 118}
120 119
121OConfItemList *OIpkg::destinations() 120OConfItemList *OIpkg::destinations()
122{ 121{
123 // Retrieve only destinations 122 // Retrieve only destinations
124 return filterConfItems( OConfItem::Destination ); 123 return filterConfItems( OConfItem::Destination );
125} 124}
126 125
127OConfItemList *OIpkg::options() 126OConfItemList *OIpkg::options()
128{ 127{
129 // Retrieve only destinations 128 // Retrieve only destinations
130 return filterConfItems( OConfItem::Option ); 129 return filterConfItems( OConfItem::Option );
131} 130}
132 131
133void OIpkg::setConfigItems( OConfItemList *configList ) 132void OIpkg::setConfigItems( OConfItemList *configList )
134{ 133{
135 if ( m_confInfo ) 134 if ( m_confInfo )
136 delete m_confInfo; 135 delete m_confInfo;
137 136
138 m_confInfo = configList; 137 m_confInfo = configList;
139 138
140 // Write out new /etc/ipkg.conf 139 // Write out new /etc/ipkg.conf
141 QFile confFile( IPKG_CONF ); 140 QFile confFile( IPKG_CONF );
142 if ( confFile.open( IO_WriteOnly ) ) 141 if ( confFile.open( IO_WriteOnly ) )
143 { 142 {
144 QTextStream confStream( &confFile ); 143 QTextStream confStream( &confFile );
145 confStream << "# Generated by Opie Package Manager\n\n"; 144 confStream << "# Generated by Opie Package Manager\n\n";
146 145
147 OConfItemListIterator it( *m_confInfo ); 146 OConfItemListIterator it( *m_confInfo );
148 for ( ; it.current(); ++it ) 147 for ( ; it.current(); ++it )
149 { 148 {
150 OConfItem *item = it.current(); 149 OConfItem *item = it.current();
151 150
152 // Only write out valid conf items 151 // Only write out valid conf items
153 if ( item->type() != OConfItem::NotDefined ) 152 if ( item->type() != OConfItem::NotDefined )
154 { 153 {
155 QString confLine; 154 QString confLine;
156 if ( !item->active() ) 155 if ( !item->active() )
157 confLine = "#"; 156 confLine = "#";
158 157
159 switch ( item->type() ) 158 switch ( item->type() )
160 { 159 {
161 case OConfItem::Source : 160 case OConfItem::Source :
162 { 161 {
163 if ( item->features().contains( "Compressed" ) ) 162 if ( item->features().contains( "Compressed" ) )
164 confLine.append( "src/gz " ); 163 confLine.append( "src/gz " );
165 else 164 else
166 confLine.append( "src " ); 165 confLine.append( "src " );
167 } 166 }
168 break; 167 break;
169 case OConfItem::Destination : confLine.append( "dest " ); break; 168 case OConfItem::Destination : confLine.append( "dest " ); break;
170 case OConfItem::Option : confLine.append( "option " ); break; 169 case OConfItem::Option : confLine.append( "option " ); break;
171 case OConfItem::Arch : confLine.append( "arch " ); break; 170 case OConfItem::Arch : confLine.append( "arch " ); break;
172 default : break; 171 default : break;
173 }; 172 };
174 173
175 confStream << confLine << " " << item->name() << " " << item->value() << "\n"; 174 confStream << confLine << " " << item->name() << " " << item->value() << "\n";
176 } 175 }
177 } 176 }
178 177
179 confFile.close(); 178 confFile.close();
180 } 179 }
181 else 180 else
182 { 181 {
@@ -483,206 +482,204 @@ bool OIpkg::executeCommand( OPackage::Command command, const QStringList &parame
483 }; 482 };
484 break; 483 break;
485 default : break; 484 default : break;
486 }; 485 };
487 486
488 return true; 487 return true;
489} 488}
490 489
491void OIpkg::ipkgMessage( char *msg ) 490void OIpkg::ipkgMessage( char *msg )
492{ 491{
493 emit signalIpkgMessage( msg ); 492 emit signalIpkgMessage( msg );
494} 493}
495 494
496void OIpkg::ipkgStatus( char *status ) 495void OIpkg::ipkgStatus( char *status )
497{ 496{
498 emit signalIpkgStatus( status ); 497 emit signalIpkgStatus( status );
499} 498}
500 499
501void OIpkg::ipkgList( char *filelist ) 500void OIpkg::ipkgList( char *filelist )
502{ 501{
503 emit signalIpkgList( filelist ); 502 emit signalIpkgList( filelist );
504} 503}
505 504
506void OIpkg::loadConfiguration() 505void OIpkg::loadConfiguration()
507{ 506{
508 if ( m_confInfo ) 507 if ( m_confInfo )
509 delete m_confInfo; 508 delete m_confInfo;
510 509
511 // Load configuration item list 510 // Load configuration item list
512 m_confInfo = new OConfItemList(); 511 m_confInfo = new OConfItemList();
513 512
514 QStringList confFiles; 513 QStringList confFiles;
515 QDir confDir( IPKG_CONF_DIR ); 514 QDir confDir( IPKG_CONF_DIR );
516 if ( confDir.exists() ) 515 if ( confDir.exists() )
517 { 516 {
518 confDir.setNameFilter( "*.conf" ); 517 confDir.setNameFilter( "*.conf" );
519 confDir.setFilter( QDir::Files ); 518 confDir.setFilter( QDir::Files );
520 confFiles = confDir.entryList( "*.conf", QDir::Files ); 519 confFiles = confDir.entryList( "*.conf", QDir::Files );
521 } 520 }
522 confFiles << IPKG_CONF; 521 confFiles << IPKG_CONF;
523 522
524 QStringList::Iterator lastFile = confFiles.end(); 523 QStringList::Iterator lastFile = confFiles.end();
525 for ( QStringList::Iterator it = confFiles.begin(); it != lastFile; ++it ) 524 for ( QStringList::Iterator it = confFiles.begin(); it != lastFile; ++it )
526 { 525 {
527 // Create absolute file path if necessary 526 // Create absolute file path if necessary
528 QString absFile = (*it); 527 QString absFile = (*it);
529 if ( !absFile.startsWith( "/" ) ) 528 if ( !absFile.startsWith( "/" ) )
530 absFile.prepend( QString( IPKG_CONF_DIR ) + "/" ); 529 absFile.prepend( QString( IPKG_CONF_DIR ) + "/" );
531 530
532 // Read in file 531 // Read in file
533 QFile f( absFile ); 532 QFile f( absFile );
534 if ( f.open( IO_ReadOnly ) ) 533 if ( f.open( IO_ReadOnly ) )
535 { 534 {
536 QTextStream s( &f ); 535 QTextStream s( &f );
537 while ( !s.eof() ) 536 while ( !s.eof() )
538 { 537 {
539 538
540 QString line = s.readLine().simplifyWhiteSpace(); 539 QString line = s.readLine().simplifyWhiteSpace();
541 540
542 // Parse line and save info to the conf options list 541 // Parse line and save info to the conf options list
543 if ( !line.isEmpty() ) 542 if ( !line.isEmpty() )
544 { 543 {
545 if ( !line.startsWith( "#" ) || 544 if ( !line.startsWith( "#" ) ||
546 line.startsWith( "#src" ) || 545 line.startsWith( "#src" ) ||
547 line.startsWith( "#src/gz" ) ||
548 line.startsWith( "#dest" ) || 546 line.startsWith( "#dest" ) ||
549 line.startsWith( "#arch" ) || 547 line.startsWith( "#arch" ) ||
550 line.startsWith( "#option" ) ) 548 line.startsWith( "#option" ) )
551 { 549 {
552 int pos = line.find( ' ', 1 ); 550 int pos = line.find( ' ', 1 );
553 551
554 // Type 552 // Type
555 QString typeStr = line.left( pos ); 553 QString typeStr = line.left( pos );
556 OConfItem::Type type; 554 OConfItem::Type type;
557 QString features; 555 QString features;
558 if ( typeStr == "src" || typeStr == "#src" ) 556 if ( typeStr == "src" || typeStr == "#src" )
559 type = OConfItem::Source; 557 type = OConfItem::Source;
560 else if ( typeStr == "src/gz" || typeStr == "#src/gz" ) 558 else if ( typeStr == "src/gz" || typeStr == "#src/gz" )
561 { 559 {
562 type = OConfItem::Source; 560 type = OConfItem::Source;
563 features = "Compressed"; 561 features = "Compressed";
564 } 562 }
565 else if ( typeStr == "dest" || typeStr == "#dest" ) 563 else if ( typeStr == "dest" || typeStr == "#dest" )
566 type = OConfItem::Destination; 564 type = OConfItem::Destination;
567 else if ( typeStr == "option" || typeStr == "#option" ) 565 else if ( typeStr == "option" || typeStr == "#option" )
568 type = OConfItem::Option; 566 type = OConfItem::Option;
569 else if ( typeStr == "arch" || typeStr == "#arch" ) 567 else if ( typeStr == "arch" || typeStr == "#arch" )
570 type = OConfItem::Arch; 568 type = OConfItem::Arch;
571 else 569 else
572 type = OConfItem::NotDefined; 570 type = OConfItem::NotDefined;
573 ++pos; 571 ++pos;
574 int endpos = line.find( ' ', pos ); 572 int endpos = line.find( ' ', pos );
575 573
576 // Name 574 // Name
577 QString name = line.mid( pos, endpos - pos ); 575 QString name = line.mid( pos, endpos - pos );
578 576
579 // Value 577 // Value
580 QString value = ""; 578 QString value = "";
581 if ( endpos > -1 ) 579 if ( endpos > -1 )
582 value = line.right( line.length() - endpos - 1 ); 580 value = line.right( line.length() - endpos - 1 );
583 581
584 // Active 582 // Active
585 bool active = !line.startsWith( "#" ); 583 bool active = !line.startsWith( "#" );
586 584
587 // Add to list 585 // Add to list
588 m_confInfo->append( new OConfItem( type, name, value, features, active ) ); 586 m_confInfo->append( new OConfItem( type, name, value, features, active ) );
589 } 587 }
590 } 588 }
591 } 589 }
592 590
593 f.close(); 591 f.close();
594 } 592 }
595 } 593 }
596 594
597 // Load Ipkg execution options from application configuration file 595 // Load Ipkg execution options from application configuration file
598 if ( m_config ) 596 if ( m_config )
599 { 597 {
600 m_config->setGroup( "Ipkg" ); 598 m_config->setGroup( "Ipkg" );
601 m_ipkgExecOptions = m_config->readNumEntry( "ExecOptions", m_ipkgExecOptions ); 599 m_ipkgExecOptions = m_config->readNumEntry( "ExecOptions", m_ipkgExecOptions );
602 m_ipkgExecVerbosity = m_config->readNumEntry( "Verbosity", m_ipkgExecVerbosity ); 600 m_ipkgExecVerbosity = m_config->readNumEntry( "Verbosity", m_ipkgExecVerbosity );
603 } 601 }
604} 602}
605 603
606OConfItemList *OIpkg::filterConfItems( OConfItem::Type typefilter ) 604OConfItemList *OIpkg::filterConfItems( OConfItem::Type typefilter )
607{ 605{
608 // Load Ipkg configuration info if not already cached 606 // Load Ipkg configuration info if not already cached
609 if ( !m_confInfo ) 607 if ( !m_confInfo )
610 loadConfiguration(); 608 loadConfiguration();
611 609
612 // Build new server list (caller is responsible for deleting) 610 // Build new server list (caller is responsible for deleting)
613 OConfItemList *sl = new OConfItemList; 611 OConfItemList *sl = new OConfItemList;
614 612
615 // If typefilter is empty, retrieve all items 613 // If typefilter is empty, retrieve all items
616 bool retrieveAll = ( typefilter == OConfItem::NotDefined ); 614 bool retrieveAll = ( typefilter == OConfItem::NotDefined );
617 615
618 // Parse configuration info for servers 616 // Parse configuration info for servers
619 OConfItemListIterator it( *m_confInfo ); 617 OConfItemListIterator it( *m_confInfo );
620 for ( ; it.current(); ++it ) 618 for ( ; it.current(); ++it )
621 { 619 {
622 OConfItem *item = it.current(); 620 OConfItem *item = it.current();
623 if ( retrieveAll || 621 if ( retrieveAll || item->type() == typefilter )
624 ( item->type() & typefilter ) )
625 { 622 {
626 sl->append( item ); 623 sl->append( item );
627 } 624 }
628 } 625 }
629 626
630 return sl; 627 return sl;
631} 628}
632 629
633const QString &OIpkg::rootPath() 630const QString &OIpkg::rootPath()
634{ 631{
635 if ( m_rootPath.isEmpty() ) 632 if ( m_rootPath.isEmpty() )
636 { 633 {
637 OConfItem *rootDest = findConfItem( OConfItem::Destination, "root" ); 634 OConfItem *rootDest = findConfItem( OConfItem::Destination, "root" );
638 rootDest ? m_rootPath = rootDest->value() 635 rootDest ? m_rootPath = rootDest->value()
639 : m_rootPath = '/'; 636 : m_rootPath = '/';
640 if ( m_rootPath.right( 1 ) == '/' ) 637 if ( m_rootPath.right( 1 ) == '/' )
641 m_rootPath.truncate( m_rootPath.length() - 1 ); 638 m_rootPath.truncate( m_rootPath.length() - 1 );
642 } 639 }
643 return m_rootPath; 640 return m_rootPath;
644} 641}
645 642
646void OIpkg::linkPackageDir( const QString &dest ) 643void OIpkg::linkPackageDir( const QString &dest )
647{ 644{
648 if ( !dest.isNull() ) 645 if ( !dest.isNull() )
649 { 646 {
650 OConfItem *destConfItem = findConfItem( OConfItem::Destination, dest ); 647 OConfItem *destConfItem = findConfItem( OConfItem::Destination, dest );
651 648
652 emit signalIpkgMessage( tr( "Linking packages installed in: %1" ).arg( dest ) ); 649 emit signalIpkgMessage( tr( "Linking packages installed in: %1" ).arg( dest ) );
653 650
654 // Set package destination directory 651 // Set package destination directory
655 QString destDir = destConfItem->value(); 652 QString destDir = destConfItem->value();
656 QString destInfoDir = destDir; 653 QString destInfoDir = destDir;
657 if ( destInfoDir.right( 1 ) != '/' ) 654 if ( destInfoDir.right( 1 ) != '/' )
658 destInfoDir.append( '/' ); 655 destInfoDir.append( '/' );
659 destInfoDir.append( IPKG_INFO_PATH ); 656 destInfoDir.append( IPKG_INFO_PATH );
660 657
661 // Get list of installed packages in destination 658 // Get list of installed packages in destination
662 QDir packageDir( destInfoDir ); 659 QDir packageDir( destInfoDir );
663 QStringList packageFiles; 660 QStringList packageFiles;
664 if ( packageDir.exists() ) 661 if ( packageDir.exists() )
665 { 662 {
666 packageDir.setNameFilter( "*.list" ); 663 packageDir.setNameFilter( "*.list" );
667 packageDir.setFilter( QDir::Files ); 664 packageDir.setFilter( QDir::Files );
668 packageFiles = packageDir.entryList( "*.list", QDir::Files ); 665 packageFiles = packageDir.entryList( "*.list", QDir::Files );
669 } 666 }
670 667
671 // Link all files for every package installed in desination 668 // Link all files for every package installed in desination
672 QStringList::Iterator lastFile = packageFiles.end(); 669 QStringList::Iterator lastFile = packageFiles.end();
673 for ( QStringList::Iterator it = packageFiles.begin(); it != lastFile; ++it ) 670 for ( QStringList::Iterator it = packageFiles.begin(); it != lastFile; ++it )
674 { 671 {
675 //emit signalIpkgMessage( QString( "Processing: %1/%2" ).arg( destInfoDir ).arg (*it) ); 672 //emit signalIpkgMessage( QString( "Processing: %1/%2" ).arg( destInfoDir ).arg (*it) );
676 QString packageFileName = destInfoDir; 673 QString packageFileName = destInfoDir;
677 packageFileName.append( '/' ); 674 packageFileName.append( '/' );
678 packageFileName.append( (*it) ); 675 packageFileName.append( (*it) );
679 QFile packageFile( packageFileName ); 676 QFile packageFile( packageFileName );
680 if ( packageFile.open( IO_ReadOnly ) ) 677 if ( packageFile.open( IO_ReadOnly ) )
681 { 678 {
682 QTextStream t( &packageFile ); 679 QTextStream t( &packageFile );
683 QString linkFile; 680 QString linkFile;
684 while ( !t.eof() ) 681 while ( !t.eof() )
685 { 682 {
686 // Get the name of the file to link and build the sym link filename 683 // Get the name of the file to link and build the sym link filename
687 linkFile = t.readLine(); 684 linkFile = t.readLine();
688 QString linkDest( linkFile.right( linkFile.length() - destDir.length() ) ); 685 QString linkDest( linkFile.right( linkFile.length() - destDir.length() ) );
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control
index 0153d40..da3ddfe 100644
--- a/noncore/settings/packagemanager/opie-packagemanager.control
+++ b/noncore/settings/packagemanager/opie-packagemanager.control
@@ -1,10 +1,10 @@
1Package: opie-packagemanager 1Package: opie-packagemanager
2Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop 2Files: plugins/application/libpackagemanager.so* bin/packagemanager pics/packagemanager apps/Settings/packagemanager.desktop
3Priority: optional 3Priority: optional
4Section: opie/settings 4Section: opie/settings
5Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg0 (>=0.99.120), ipkg-link 5Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg (>=0.99.120)
6Replaces: packagemanager 6Replaces: packagemanager
7Architecture: arm 7Architecture: arm
8Maintainer: Dan Williams (drw@handhelds.org) 8Maintainer: Dan Williams (drw@handhelds.org)
9Description: Opie package management client 9Description: Opie package management client
10Version: $QPE_VERSION$EXTRAVERSION 10Version: 0.6.1$EXTRAVERSION