fixing repomirror and some patterns

This commit is contained in:
brent s. 2020-06-19 02:43:38 -04:00
parent f4f8f482b8
commit 92fcb85cb9
Signed by: bts
GPG Key ID: 8C004C2F93481F6B
3 changed files with 4 additions and 4 deletions

View File

@ -41,7 +41,7 @@
<xs:element name="syncType" type="t_repomir_synctype" minOccurs="1"/> <xs:element name="syncType" type="t_repomir_synctype" minOccurs="1"/>
<xs:element name="domain" type="xs:token" minOccurs="1"/> <xs:element name="domain" type="xs:token" minOccurs="1"/>
<xs:element name="port" minOccurs="0" type="t_net_port"/> <xs:element name="port" minOccurs="0" type="t_net_port"/>
<xs:element name="path" minOccurs="1" type="t_unix_filepath"/> <xs:element name="path" minOccurs="1" type="t_unix_dirpath"/>
</xs:all> </xs:all>
</xs:complexType> </xs:complexType>



View File

@ -25,7 +25,7 @@
dir: ^\s*(~?/[^/]*)+/?\s*$ dir: ^\s*(~?/[^/]*)+/?\s*$
file: ^\s*(~?/[^/]+)+\s*$ file: ^\s*(~?/[^/]+)+\s*$
reldir: ^\s*[^/](([^/]*)+/?)+\s*$ reldir: ^\s*[^/](([^/]*)+/?)+\s*$
relfile: ^\s*[^/]+([^/]*)+[^/]\s*$ relfile: ^\s*[^/]+(/|[^/]*)*[^/]+\s*$
--> -->
<!-- ABSOLUTE directory path --> <!-- ABSOLUTE directory path -->
<xs:simpleType name="t_unix_dirpath"> <xs:simpleType name="t_unix_dirpath">
@ -53,7 +53,7 @@
<!-- RELATIVE file path --> <!-- RELATIVE file path -->
<xs:simpleType name="t_unix_relfilepath"> <xs:simpleType name="t_unix_relfilepath">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:pattern value="\s*[^/]+([^/]*)+[^/]\s*"/> <xs:pattern value="\s*([^/]+)(/[^/]+)*([^/])*\s*"/>
<xs:whiteSpace value="collapse"/> <xs:whiteSpace value="collapse"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>

View File

@ -20,7 +20,7 @@
<xs:sequence minOccurs="1"> <xs:sequence minOccurs="1">
<xs:choice minOccurs="1" maxOccurs="unbounded"> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="upstream" type="e_repomir_upstream" minOccurs="1" maxOccurs="unbounded"/> <xs:element name="upstream" type="e_repomir_upstream" minOccurs="1" maxOccurs="unbounded"/>
<xs:element name="dest" type="t_unix_filepath" minOccurs="1" maxOccurs="1"/> <xs:element name="dest" type="t_unix_dirpath" minOccurs="1" maxOccurs="1"/>
<xs:element name="lastLocalCheck" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="lastLocalCheck" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="lastLocalSync" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="lastLocalSync" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="lastRemoteUpdate" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="1"/> <xs:element name="lastRemoteUpdate" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="1"/>