summaryrefslogtreecommitdiff
path: root/noncore/settings/packagemanager/oipkg.cpp
Unidiff
Diffstat (limited to 'noncore/settings/packagemanager/oipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index f2d7e39..a885ef8 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -105,25 +105,26 @@ OIpkg::~OIpkg()
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::Source ); 117 return filterConfItems( (OConfItem::Type)((int)OConfItem::Source |
118 (int)OConfItem::GzSource) );
118} 119}
119 120
120OConfItemList *OIpkg::destinations() 121OConfItemList *OIpkg::destinations()
121{ 122{
122 // Retrieve only destinations 123 // Retrieve only destinations
123 return filterConfItems( OConfItem::Destination ); 124 return filterConfItems( OConfItem::Destination );
124} 125}
125 126
126OConfItemList *OIpkg::options() 127OConfItemList *OIpkg::options()
127{ 128{
128 // Retrieve only destinations 129 // Retrieve only destinations
129 return filterConfItems( OConfItem::Option ); 130 return filterConfItems( OConfItem::Option );
@@ -534,24 +535,25 @@ void OIpkg::loadConfiguration()
534 { 535 {
535 QTextStream s( &f ); 536 QTextStream s( &f );
536 while ( !s.eof() ) 537 while ( !s.eof() )
537 { 538 {
538 539
539 QString line = s.readLine().simplifyWhiteSpace(); 540 QString line = s.readLine().simplifyWhiteSpace();
540 541
541 // Parse line and save info to the conf options list 542 // Parse line and save info to the conf options list
542 if ( !line.isEmpty() ) 543 if ( !line.isEmpty() )
543 { 544 {
544 if ( !line.startsWith( "#" ) || 545 if ( !line.startsWith( "#" ) ||
545 line.startsWith( "#src" ) || 546 line.startsWith( "#src" ) ||
547 line.startsWith( "#src/gz" ) ||
546 line.startsWith( "#dest" ) || 548 line.startsWith( "#dest" ) ||
547 line.startsWith( "#arch" ) || 549 line.startsWith( "#arch" ) ||
548 line.startsWith( "#option" ) ) 550 line.startsWith( "#option" ) )
549 { 551 {
550 int pos = line.find( ' ', 1 ); 552 int pos = line.find( ' ', 1 );
551 553
552 // Type 554 // Type
553 QString typeStr = line.left( pos ); 555 QString typeStr = line.left( pos );
554 OConfItem::Type type; 556 OConfItem::Type type;
555 QString features; 557 QString features;
556 if ( typeStr == "src" || typeStr == "#src" ) 558 if ( typeStr == "src" || typeStr == "#src" )
557 type = OConfItem::Source; 559 type = OConfItem::Source;
@@ -609,25 +611,26 @@ OConfItemList *OIpkg::filterConfItems( OConfItem::Type typefilter )
609 611
610 // Build new server list (caller is responsible for deleting) 612 // Build new server list (caller is responsible for deleting)
611 OConfItemList *sl = new OConfItemList; 613 OConfItemList *sl = new OConfItemList;
612 614
613 // If typefilter is empty, retrieve all items 615 // If typefilter is empty, retrieve all items
614 bool retrieveAll = ( typefilter == OConfItem::NotDefined ); 616 bool retrieveAll = ( typefilter == OConfItem::NotDefined );
615 617
616 // Parse configuration info for servers 618 // Parse configuration info for servers
617 OConfItemListIterator it( *m_confInfo ); 619 OConfItemListIterator it( *m_confInfo );
618 for ( ; it.current(); ++it ) 620 for ( ; it.current(); ++it )
619 { 621 {
620 OConfItem *item = it.current(); 622 OConfItem *item = it.current();
621 if ( retrieveAll || item->type() == typefilter ) 623 if ( retrieveAll ||
624 ( item->type() & typefilter ) )
622 { 625 {
623 sl->append( item ); 626 sl->append( item );
624 } 627 }
625 } 628 }
626 629
627 return sl; 630 return sl;
628} 631}
629 632
630const QString &OIpkg::rootPath() 633const QString &OIpkg::rootPath()
631{ 634{
632 if ( m_rootPath.isEmpty() ) 635 if ( m_rootPath.isEmpty() )
633 { 636 {