Attachment 48895 Details for Bug 115315

[patch] installation_sources.diff

installation_sources.diff (text/plain), 1.23 KB, created by Christoph Thiel on 2005-09-06 10:01:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Thiel

Created: 2005-09-06 10:01:07 UTC

Size: 1.23 KB

patch

obsolete

>--- src/installation_sources.cc
>+++ src/installation_sources.cc
>@@ -84,15 +84,26 @@
>     }
> 
>     PMError error = instSrcMgr.scanMedia( sourceIds, url );
>-    if ( error ) {
>+    if ( error != PMError::E_ok ) {
>       cerr << error << endl;
>+      exit( 1 );
>     }
>     
>     InstSrcManager::ISrcIdList::const_iterator it;
>     for( it = sourceIds.begin(); it != sourceIds.end(); ++it ) {
>-      error = instSrcMgr.enableSource( *it );
>-      if ( error ) {
>+      if ( ! enableSource ) {
>+        error = instSrcMgr.setAutoenable(*it, false);
>+        if ( error != PMError::E_ok ) {
>+          cerr << error << endl;
>+          exit( 1 );
>+        }
>+        error = instSrcMgr.disableSource(*it);
>+      } else {
>+        error = instSrcMgr.enableSource( *it );
>+      }
>+      if ( error != PMError::E_ok ) {
>         cerr << error << endl;
>+        exit( 1 );
>       }
>     }
>   }
>@@ -105,6 +116,12 @@
>   InstSrcManager::ISrcIdList::const_iterator it;
>   for( it = sourceIds.begin(); it != sourceIds.end(); ++it ) {
>     constInstSrcDescrPtr descr = (*it)->descr();
>+
>+    if ( descr->default_activate() )
>+      cout << "[x] ";
>+    else
>+      cout << "[ ] "; 
>+       
>     cout << descr->content_label() << " (" << descr->url() << ")" << endl;
>   }
>

Actions: View | Diff

Attachments on bug 115315: 48895 | 48919