Author: dmacvicar
Date: Fri Aug 3 17:18:54 2007
New Revision: 6458
URL: http://svn.opensuse.org/viewcvs/zypp?rev=6458&view=rev
Log:
- fix
Modified:
trunk/zypper/VERSION.cmake
trunk/zypper/src/zypper-sources.cc
trunk/zypper/src/zypper-sources.h
Modified: trunk/zypper/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?rev=6458&r1=6457&r2=6458&view=diff
==============================================================================
--- trunk/zypper/VERSION.cmake (original)
+++ trunk/zypper/VERSION.cmake Fri Aug 3 17:18:54 2007
@@ -20,4 +20,4 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "8")
-SET(VERSION_PATCH "7"
+SET(VERSION_PATCH "7")
Modified: trunk/zypper/src/zypper-sources.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev=6458&r1=6457&r2=6458&view=diff
==============================================================================
--- trunk/zypper/src/zypper-sources.cc (original)
+++ trunk/zypper/src/zypper-sources.cc Fri Aug 3 17:18:54 2007
@@ -298,7 +298,7 @@
{
RepoManager manager;
- cout_v << format(_("Adding repository '%s'.")) % repo.alias() << endl;
+ //cout_v << format(_("Adding repository '%s'.")) % repo.alias() << endl;
MIL << "Going to add repository: " << repo << endl;
try
@@ -354,7 +354,8 @@
// ----------------------------------------------------------------------------
int add_repo_by_url( const zypp::Url & url, const string & alias,
- const string & type, bool enabled, bool refresh )
+ const string & type,
+ tribool enabled, tribool autorefresh)
{
RepoManager manager;
RepoInfo repo;
@@ -364,9 +365,12 @@
repo.setAlias(alias.empty() ? timestamp() : alias);
repo.addBaseUrl(url);
- repo.setEnabled(enabled);
- repo.setAutorefresh(refresh);
-
+
+ if ( enabled != indeterminate )
+ repo.setEnabled(enabled);
+ if ( autorefresh != indeterminate )
+ repo.setAutorefresh(autorefresh);
+
return add_repo(repo);
}
@@ -374,21 +378,24 @@
//! \todo handle zypp exceptions
int add_repo_from_file(const std::string & repo_file_url,
- bool enabled, bool autorefresh)
+ tribool enabled, tribool autorefresh)
{
//! \todo handle local .repo files, validate the URL
Url url(repo_file_url);
RepoManager manager;
list<RepoInfo> repos = readRepoFile(url);
- for (list<RepoInfo>::iterator it = repos.begin();
+ for (list<RepoInfo>::const_iterator it = repos.begin();
it != repos.end(); ++it)
{
RepoInfo repo = *it;
- repo.setEnabled(enabled);
- repo.setAutorefresh(autorefresh);
-
+ MIL << "enabled: " << enabled << " autorefresh: " << autorefresh << endl;
+ if ( !indeterminate(enabled) )
+ repo.setEnabled((enabled == true));
+ if ( !indeterminate(autorefresh) )
+ repo.setAutorefresh((autorefresh == true));
+ MIL << "enabled: " << repo.enabled() << " autorefresh: " << repo.autorefresh() << endl;
add_repo(repo);
}
Modified: trunk/zypper/src/zypper-sources.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.h?rev=6458&r1=6457&r2=6458&view=diff
==============================================================================
--- trunk/zypper/src/zypper-sources.h (original)
+++ trunk/zypper/src/zypper-sources.h Fri Aug 3 17:18:54 2007
@@ -2,7 +2,7 @@
#define ZMART_SOURCES_H
#include "zypp/Url.h"
-
+#include