Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10697 - in /trunk/zypper: src/Zypper.cc src/repos.cc src/repos.h src/utils/misc.h zypper.spec.cmake
  • From: jkupec@xxxxxxxxxxxxxxxx
  • Date: Wed, 30 Jul 2008 12:13:46 -0000
  • Message-id: <20080730121346.48BC62E397@xxxxxxxxxxxxxxxx>
Author: jkupec
Date: Wed Jul 30 14:13:45 2008
New Revision: 10697

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10697&view=rev
Log:
- adapted to Service change

Modified:
trunk/zypper/src/Zypper.cc
trunk/zypper/src/repos.cc
trunk/zypper/src/repos.h
trunk/zypper/src/utils/misc.h
trunk/zypper/zypper.spec.cmake

Modified: trunk/zypper/src/Zypper.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=10697&r1=10696&r2=10697&view=diff
==============================================================================
--- trunk/zypper/src/Zypper.cc (original)
+++ trunk/zypper/src/Zypper.cc Wed Jul 30 14:13:45 2008
@@ -2168,11 +2168,11 @@

warn_if_zmd();

- set<Service, ServiceAliasComparator> to_remove;
+ set<ServiceInfo, ServiceAliasComparator> to_remove;
for (vector<string>::const_iterator it = _arguments.begin();
it != _arguments.end(); ++it)
{
- Service s;
+ ServiceInfo s;
if (match_service(*this, *it, &s))
{
to_remove.insert(s);

Modified: trunk/zypper/src/repos.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?rev=10697&r1=10696&r2=10697&view=diff
==============================================================================
--- trunk/zypper/src/repos.cc (original)
+++ trunk/zypper/src/repos.cc Wed Jul 30 14:13:45 2008
@@ -1757,7 +1757,7 @@
// ---------------------------------------------------------------------------

static void print_service_list(Zypper & zypper,
- const list<Service> & services)
+ const list<ServiceInfo> & services)
{
Table tbl;
bool all = zypper.cOpts().count("details");
@@ -1785,10 +1785,10 @@

int i = 1;

- for (list<Service>::const_iterator it = services.begin();
+ for (list<ServiceInfo>::const_iterator it = services.begin();
it != services.end(); ++it)
{
- Service service = *it;
+ ServiceInfo service = *it;
TableRow tr(all ? 8 : showprio || showuri ? 7 : 6);

// number
@@ -1859,7 +1859,7 @@
void list_services(Zypper & zypper)
{
RepoManager manager(zypper.globalOpts().rm_options);
- list<Service> services;
+ list<ServiceInfo> services;

try
{
@@ -1920,7 +1920,7 @@

// ---------------------------------------------------------------------------

-void add_service(Zypper & zypper, const Service & service)
+void add_service(Zypper & zypper, const ServiceInfo & service)
{
RepoManager manager(zypper.globalOpts().rm_options);

@@ -1961,7 +1961,7 @@
MIL << "going to add service by url (alias=" << alias << ", url=" << url
<< ")" << endl;

- Service service;
+ ServiceInfo service;

//! \todo what about service type? compare to rug. idea: do addrepo if type
is specified and is not NU.
//if ( ! type.empty() )
@@ -1982,7 +1982,7 @@

// ---------------------------------------------------------------------------

-void remove_service(Zypper & zypper, const Service & service)
+void remove_service(Zypper & zypper, const ServiceInfo & service)
{
RepoManager manager(zypper.globalOpts().rm_options);

@@ -2000,7 +2000,7 @@

RepoManager manager(zypper.globalOpts().rm_options);

- list<Service> services;
+ list<ServiceInfo> services;
try
{
services.insert(services.end(), manager.serviceBegin(),
manager.serviceEnd());
@@ -2015,7 +2015,7 @@

for_(sit, services.begin(), services.end())
{
- Service s = *sit;
+ ServiceInfo s = *sit;

try
{
@@ -2038,15 +2038,15 @@

// ---------------------------------------------------------------------------

-bool match_service(Zypper & zypper, string str, Service * service)
+bool match_service(Zypper & zypper, string str, ServiceInfo * service)
{
RepoManager manager(zypper.globalOpts().rm_options);
- list<Service> known;
+ list<ServiceInfo> known;
known.insert(known.end(), manager.serviceBegin(), manager.serviceEnd());
bool found = false;

unsigned int number = 1; // repo number
- for (list<Service>::const_iterator known_it = known.begin();
+ for (list<ServiceInfo>::const_iterator known_it = known.begin();
known_it != known.end(); ++known_it, ++number)
{
unsigned int tmp = 0;

Modified: trunk/zypper/src/repos.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.h?rev=10697&r1=10696&r2=10697&view=diff
==============================================================================
--- trunk/zypper/src/repos.h (original)
+++ trunk/zypper/src/repos.h Wed Jul 30 14:13:45 2008
@@ -11,7 +11,7 @@
#include "zypp/TriBool.h"
#include "zypp/Url.h"
#include "zypp/RepoInfo.h"
-#include "zypp/Service.h"
+#include "zypp/ServiceInfo.h"

#include "Zypper.h"

@@ -139,18 +139,18 @@

void list_services(Zypper & zypper);

-void add_service(Zypper & zypper, const zypp::Service & service);
+void add_service(Zypper & zypper, const zypp::ServiceInfo & service);

void add_service_by_url( Zypper & zypper,
const zypp::Url & url, const std::string & alias,
const std::string & type,
boost::tribool enabled = boost::indeterminate);

-void remove_service(Zypper & zypper, const zypp::Service & service);
+void remove_service(Zypper & zypper, const zypp::ServiceInfo & service);

void refresh_services(Zypper & zypper);

-bool match_service(Zypper & zypper, std::string str, zypp::Service * service);
+bool match_service(Zypper & zypper, std::string str, zypp::ServiceInfo *
service);

/**
* Initialize rpm database on target, if not already initialized.

Modified: trunk/zypper/src/utils/misc.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils/misc.h?rev=10697&r1=10696&r2=10697&view=diff
==============================================================================
--- trunk/zypper/src/utils/misc.h (original)
+++ trunk/zypper/src/utils/misc.h Wed Jul 30 14:13:45 2008
@@ -15,7 +15,7 @@
#include "zypp/Resolvable.h"
#include "zypp/Pathname.h"
#include "zypp/RepoInfo.h"
-#include "zypp/Service.h"
+#include "zypp/ServiceInfo.h"

#include "Zypper.h"

@@ -82,7 +82,7 @@
// comparator for Service set
class ServiceAliasComparator
{
- public: bool operator()(const zypp::Service & a, const zypp::Service & b)
+ public: bool operator()(const zypp::ServiceInfo & a, const zypp::ServiceInfo
& b)
{
return a.alias() < b.alias();
}

Modified: trunk/zypper/zypper.spec.cmake
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/zypper.spec.cmake?rev=10697&r1=10696&r2=10697&view=diff
==============================================================================
--- trunk/zypper/zypper.spec.cmake (original)
+++ trunk/zypper/zypper.spec.cmake Wed Jul 30 14:13:45 2008
@@ -11,7 +11,7 @@
# norootforbuild

Name: @PACKAGE@
-BuildRequires: libzypp-devel >= 4.21.2 boost-devel >= 1.33.1 gettext-devel >=
0.15 readline-devel >= 5.1
+BuildRequires: libzypp-devel >= 5.4.0 boost-devel >= 1.33.1 gettext-devel >=
0.15 readline-devel >= 5.1
BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6
Requires: procps
Recommends: logrotate cron

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages