author | drw <drw> | 2005-01-04 15:27:01 (UTC) |
---|---|---|
committer | drw <drw> | 2005-01-04 15:27:01 (UTC) |
commit | 653ffebd614ef90bc5524fdf910776d4af0a48a7 (patch) (side-by-side diff) | |
tree | ab9d9771466d2fc8e3f06b50731dcffa0925a503 /noncore/settings/packagemanager/oipkg.cpp | |
parent | a63d6d1896bcb6f1ac3b041e3d46edf0ec9e8082 (diff) | |
download | opie-653ffebd614ef90bc5524fdf910776d4af0a48a7.zip opie-653ffebd614ef90bc5524fdf910776d4af0a48a7.tar.gz opie-653ffebd614ef90bc5524fdf910776d4af0a48a7.tar.bz2 |
Undo previous commit
Diffstat (limited to 'noncore/settings/packagemanager/oipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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 @@ -111,14 +111,13 @@ OConfItemList *OIpkg::configItems() return filterConfItems(); } OConfItemList *OIpkg::servers() { // Retrieve only servers - return filterConfItems( (OConfItem::Type)((int)OConfItem::Source | - (int)OConfItem::GzSource) ); + return filterConfItems( OConfItem::Source ); } OConfItemList *OIpkg::destinations() { // Retrieve only destinations return filterConfItems( OConfItem::Destination ); @@ -541,13 +540,12 @@ void OIpkg::loadConfiguration() // Parse line and save info to the conf options list if ( !line.isEmpty() ) { if ( !line.startsWith( "#" ) || line.startsWith( "#src" ) || - line.startsWith( "#src/gz" ) || line.startsWith( "#dest" ) || line.startsWith( "#arch" ) || line.startsWith( "#option" ) ) { int pos = line.find( ' ', 1 ); @@ -617,14 +615,13 @@ OConfItemList *OIpkg::filterConfItems( OConfItem::Type typefilter ) // Parse configuration info for servers OConfItemListIterator it( *m_confInfo ); for ( ; it.current(); ++it ) { OConfItem *item = it.current(); - if ( retrieveAll || - ( item->type() & typefilter ) ) + if ( retrieveAll || item->type() == typefilter ) { sl->append( item ); } } return sl; |