summaryrefslogtreecommitdiff
authordrw <drw>2004-04-21 15:59:57 (UTC)
committer drw <drw>2004-04-21 15:59:57 (UTC)
commit7dc2ed4e55acf69b0edf01ded81f00b61c472312 (patch) (unidiff)
tree3d90c6ca4484f8558a530aa9169a27213ce01586
parent5ac20617216e4592685940ede23f135d86e8d2cd (diff)
downloadopie-7dc2ed4e55acf69b0edf01ded81f00b61c472312.zip
opie-7dc2ed4e55acf69b0edf01ded81f00b61c472312.tar.gz
opie-7dc2ed4e55acf69b0edf01ded81f00b61c472312.tar.bz2
Should have deleted a line before checking in...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index b9c82df..696a64a 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -166,49 +166,48 @@ void OIpkg::setConfigItems( OConfItemList *configList )
166 else 166 else
167 { 167 {
168 // Problem writing to /etc/ipkg.conf, exit before removing other conf files 168 // Problem writing to /etc/ipkg.conf, exit before removing other conf files
169 return; 169 return;
170 } 170 }
171 171
172 // Delete /etc/ipkg/*.conf files (/etc/ipkg.conf should now have all settings 172 // Delete /etc/ipkg/*.conf files (/etc/ipkg.conf should now have all settings
173 QStringList confFiles; 173 QStringList confFiles;
174 QDir confDir( IPKG_CONF_DIR ); 174 QDir confDir( IPKG_CONF_DIR );
175 if ( confDir.exists() ) 175 if ( confDir.exists() )
176 { 176 {
177 confDir.setNameFilter( "*.conf" ); 177 confDir.setNameFilter( "*.conf" );
178 confDir.setFilter( QDir::Files ); 178 confDir.setFilter( QDir::Files );
179 confFiles = confDir.entryList( "*.conf", QDir::Files ); 179 confFiles = confDir.entryList( "*.conf", QDir::Files );
180 180
181 QStringList::Iterator lastFile = confFiles.end(); 181 QStringList::Iterator lastFile = confFiles.end();
182 for ( QStringList::Iterator it = confFiles.begin(); it != lastFile; ++it ) 182 for ( QStringList::Iterator it = confFiles.begin(); it != lastFile; ++it )
183 { 183 {
184 // Create absolute file path if necessary 184 // Create absolute file path if necessary
185 QString absFile = (*it); 185 QString absFile = (*it);
186 if ( !absFile.startsWith( "/" ) ) 186 if ( !absFile.startsWith( "/" ) )
187 absFile.prepend( QString( IPKG_CONF_DIR ) + "/" ); 187 absFile.prepend( QString( IPKG_CONF_DIR ) + "/" );
188 188
189 // Delete file 189 // Delete file
190printf( "Deleting: \'%s\'\n", absFile.latin1() );
191 QFile::remove( absFile ); 190 QFile::remove( absFile );
192 } 191 }
193 } 192 }
194 193
195 // Reinitialize libipkg to pick up new configuration 194 // Reinitialize libipkg to pick up new configuration
196 ipkg_deinit( &m_ipkgArgs ); 195 ipkg_deinit( &m_ipkgArgs );
197 ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ); 196 ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs );
198 m_ipkgArgs.noaction = false; 197 m_ipkgArgs.noaction = false;
199 m_ipkgArgs.force_defaults = true; 198 m_ipkgArgs.force_defaults = true;
200} 199}
201 200
202void OIpkg::saveSettings() 201void OIpkg::saveSettings()
203{ 202{
204 // Save Ipkg execution options to application configuration file 203 // Save Ipkg execution options to application configuration file
205 if ( m_config ) 204 if ( m_config )
206 { 205 {
207 m_config->setGroup( "Ipkg" ); 206 m_config->setGroup( "Ipkg" );
208 m_config->writeEntry( "ExecOptions", m_ipkgExecOptions ); 207 m_config->writeEntry( "ExecOptions", m_ipkgExecOptions );
209 m_config->writeEntry( "Verbosity", m_ipkgExecVerbosity ); 208 m_config->writeEntry( "Verbosity", m_ipkgExecVerbosity );
210 } 209 }
211} 210}
212 211
213OPackageList *OIpkg::availablePackages( const QString &server ) 212OPackageList *OIpkg::availablePackages( const QString &server )
214{ 213{