← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nordugrid-arc/trusty

« back to all changes in this revision

Viewing changes to src/clients/arclib/utils.cpp

  • Committer: Package Import Robot
  • Author(s): Mattias Ellert
  • Date: 2012-12-13 16:41:31 UTC
  • mfrom: (3.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20121213164131-wii0p2fcv7e3en93
Tags: 2.0.1-1
* 2.0.1 Release
* Drop patches accepted upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/clients/arclib/utils.cpp
39
39
  if (computingelements.empty() && registries.empty()) {
40
40
    std::list<Arc::ConfigEndpoint> endpoints = usercfg.GetDefaultServices();
41
41
    for (std::list<Arc::ConfigEndpoint>::const_iterator its = endpoints.begin(); its != endpoints.end(); its++) {
42
 
      services.push_back(Arc::Endpoint(*its));
 
42
      services.push_back(*its);
43
43
    }
44
44
  } else {
45
45
    for (std::list<std::string>::const_iterator it = computingelements.begin(); it != computingelements.end(); it++) {
53
53
          services.push_back(service);
54
54
      } else {
55
55
        // if it was a group (or an alias), add all the services
56
 
        services.insert(services.end(), newServices.begin(), newServices.end());
 
56
        for (std::list<Arc::ConfigEndpoint>::iterator its = newServices.begin(); its != newServices.end(); its++) {
 
57
          if (!requestedSubmissionInterfaceName.empty()) {
 
58
            // if there was a submission interface requested, this overrides the one from the config
 
59
            its->RequestedSubmissionInterfaceName = requestedSubmissionInterfaceName;    
 
60
          }
 
61
          services.push_back(*its);
 
62
        }
57
63
      }
58
64
    }
59
65
    for (std::list<std::string>::const_iterator it = registries.begin(); it != registries.end(); it++) {
355
361
    
356
362
    AddOption('S', "submissioninterface",
357
363
              istring("only use this interface for submitting "
358
 
                      "(e.g. org.nordugrid.gridftpjob, org.ogf.emies, org.nordugrid.xbes)"),
 
364
                      "(e.g. org.nordugrid.gridftpjob, org.ogf.emies, org.ogf.bes)"),
359
365
              istring("InterfaceName"),
360
366
              requestedSubmissionInterfaceName);
361
367
 
394
400
  if (c == CO_INFO) {
395
401
    AddOption('S', "submissioninterface",
396
402
              istring("only get information about executon targets which supports this job submission interface "
397
 
                      "(e.g. org.nordugrid.gridftpjob, org.ogf.emies, org.nordugrid.xbes)"),
 
403
                      "(e.g. org.nordugrid.gridftpjob, org.ogf.emies, org.ogf.bes)"),
398
404
              istring("InterfaceName"),
399
405
              requestedSubmissionInterfaceName);
400
406
  }