Changeset 467cd2e for fedd


Ignore:
Timestamp:
Sep 20, 2013 10:35:13 AM (6 years ago)
Author:
Ted Faber <faber@…>
Branches:
master
Children:
befb8e4
Parents:
1f9c361 (diff), b213b53 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

Location:
fedd
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • fedd/Makefile

    r6bedbdba rb213b53  
    1616WSDL_FILES= ../wsdl/fedd.wsdl ../wsdl/fedd_types.xsd ../wsdl/fedd_internal.wsdl ../wsdl/topdl.xsd
    1717
    18 VERSION=3.21b
     18VERSION=3.50b
    1919
    2020DISTFILES= dist/fedd-${VERSION}.tar.gz dist/deter-data-${VERSION}.tar.gz
  • fedd/federation/access.py

    r4ffa6f8 r1f9c361  
    357357
    358358        cmd = "%s %s" % (self.userconfcmd, project)
    359         conf = subprocess.call(shlex.split(cmd),
     359        try:
     360            conf = subprocess.call(shlex.split(cmd),
    360361                stdout=cf, stderr=dev_null, close_fds=True)
     362        except EnvironmentError,e:
     363            raise service_error(service_error.internal,
     364                    "Could not run userconf command: %s %s" \
     365                            % (e.filename, e.strerror))
    361366
    362367        self.auth.set_attribute(confid, "/%s" % str(confid))
  • fedd/setup.py

    rcf7bc45 rb213b53  
    44
    55setup(name='fedd',
    6         version='3.21b',
     6        version='3.50b',
    77        description='DETER Federation daemon',
    88        author='Ted Faber',
Note: See TracChangeset for help on using the changeset viewer.