From d7bd89075d7003f2eedea3b6af2612107946e05c Mon Sep 17 00:00:00 2001 From: Chulwoo Shin Date: Mon, 17 Apr 2017 17:51:34 +0900 Subject: [PATCH] [TIC-CORE] change the license from apache 2.0 to flora 1.1 - change the license - update the boilerplate in source code Change-Id: I75fb373a8f08900fe9c146dbdb41a7a13089fda8 Signed-off-by: Chulwoo Shin --- COPYING | 205 ++++++++++++++++++++++++++++++++++++++++++++ setup.py | 9 +- test/suite.py | 9 +- test/test_dependency.py | 13 ++- test/test_repodata.py | 9 +- test/test_threadsafe.py | 22 +++-- tic/command.py | 9 +- tic/config.py | 17 ++++ tic/dependency.py | 9 +- tic/parser/recipe_parser.py | 9 +- tic/parser/repo_parser.py | 9 +- tic/parser/view_parser.py | 18 ++++ tic/pykickstarter.py | 9 +- tic/pymic.py | 9 +- tic/repo.py | 99 +++++++++++---------- tic/server/tic_server.py | 18 ++++ tic/utils/error.py | 9 +- tic/utils/file.py | 9 +- tic/utils/grabber.py | 9 +- tic/utils/log.py | 9 +- tic/utils/misc.py | 18 ++++ tic/utils/process.py | 9 +- tic/utils/rpmmisc.py | 9 +- tools/tic-core | 9 +- 24 files changed, 399 insertions(+), 155 deletions(-) diff --git a/COPYING b/COPYING index e69de29..ac32f71 100644 --- a/COPYING +++ b/COPYING @@ -0,0 +1,205 @@ +Flora License + +Version 1.1, April, 2013 + +http://floralicense.org/license/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, +and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by +the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and +all other entities that control, are controlled by, or are +under common control with that entity. For the purposes of +this definition, "control" means (i) the power, direct or indirect, +to cause the direction or management of such entity, +whether by contract or otherwise, or (ii) ownership of fifty percent (50%) +or more of the outstanding shares, or (iii) beneficial ownership of +such entity. + +"You" (or "Your") shall mean an individual or Legal Entity +exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, +and configuration files. + +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but +not limited to compiled object code, generated documentation, +and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice +that is included in or attached to the work (an example is provided +in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, +that is based on (or derived from) the Work and for which the editorial +revisions, annotations, elaborations, or other modifications represent, +as a whole, an original work of authorship. For the purposes of this License, +Derivative Works shall not include works that remain separable from, +or merely link (or bind by name) to the interfaces of, the Work and +Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor +for inclusion in the Work by the copyright owner or by an individual or +Legal Entity authorized to submit on behalf of the copyright owner. +For the purposes of this definition, "submitted" means any form of +electronic, verbal, or written communication sent to the Licensor or +its representatives, including but not limited to communication on +electronic mailing lists, source code control systems, and issue +tracking systems that are managed by, or on behalf of, the Licensor +for the purpose of discussing and improving the Work, but excluding +communication that is conspicuously marked or otherwise designated +in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity +on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +"Tizen Certified Platform" shall mean a software platform that complies +with the standards set forth in the Tizen Compliance Specification +and passes the Tizen Compliance Tests as defined from time to time +by the Tizen Technical Steering Group and certified by the Tizen +Association or its designated agent. + +2. Grant of Copyright License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the +Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, +use, offer to sell, sell, import, and otherwise transfer the Work +solely as incorporated into a Tizen Certified Platform, where such +license applies only to those patent claims licensable by such +Contributor that are necessarily infringed by their Contribution(s) +alone or by combination of their Contribution(s) with the Work solely +as incorporated into a Tizen Certified Platform to which such +Contribution(s) was submitted. If You institute patent litigation +against any entity (including a cross-claim or counterclaim +in a lawsuit) alleging that the Work or a Contribution incorporated +within the Work constitutes direct or contributory patent infringement, +then any patent licenses granted to You under this License for that +Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the +Work or Derivative Works thereof pursuant to the copyright license +above, in any medium, with or without modifications, and in Source or +Object form, provided that You meet the following conditions: + + 1. You must give any other recipients of the Work or Derivative Works + a copy of this License; and + 2. You must cause any modified files to carry prominent notices stating + that You changed the files; and + 3. You must retain, in the Source form of any Derivative Works that + You distribute, all copyright, patent, trademark, and attribution + notices from the Source form of the Work, excluding those notices + that do not pertain to any part of the Derivative Works; and + 4. If the Work includes a "NOTICE" text file as part of its distribution, + then any Derivative Works that You distribute must include a readable + copy of the attribution notices contained within such NOTICE file, + excluding those notices that do not pertain to any part of + the Derivative Works, in at least one of the following places: + within a NOTICE text file distributed as part of the Derivative Works; + within the Source form or documentation, if provided along with the + Derivative Works; or, within a display generated by the Derivative Works, + if and wherever such third-party notices normally appear. + The contents of the NOTICE file are for informational purposes only + and do not modify the License. You may add Your own attribution notices + within Derivative Works that You distribute, alongside or as an addendum + to the NOTICE text from the Work, provided that such additional attribution + notices cannot be construed as modifying the License. You may add Your own + copyright statement to Your modifications and may provide additional or + different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works + as a whole, provided Your use, reproduction, and distribution of + the Work otherwise complies with the conditions stated in this License + and your own copyright statement or terms and conditions do not conflict + the conditions stated in the License including section 3. + +5. Submission of Contributions. Unless You explicitly state otherwise, +any Contribution intentionally submitted for inclusion in the Work +by You to the Licensor shall be under the terms and conditions of +this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify +the terms of any separate license agreement you may have executed +with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the +origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or +agreed to in writing, Licensor provides the Work (and each +Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions +of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +PARTICULAR PURPOSE. You are solely responsible for determining the +appropriateness of using or redistributing the Work and assume any +risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, +whether in tort (including negligence), contract, or otherwise, +unless required by applicable law (such as deliberate and grossly +negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a +result of this License or out of the use or inability to use the +Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses), even if such Contributor +has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing +the Work or Derivative Works thereof, You may choose to offer, +and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this +License. However, in accepting such obligations, You may act only +on Your own behalf and on Your sole responsibility, not on behalf +of any other Contributor, and only if You agree to indemnify, +defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason +of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Flora License to your work + +To apply the Flora License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "[]" +replaced with your own identifying information. (Don't include +the brackets!) The text should be enclosed in the appropriate +comment syntax for the file format. We also recommend that a +file or class name and description of purpose be included on the +same "printed page" as the copyright notice for easier +identification within third-party archives. + + Copyright 2015 Samsung Electronics Co., Ltd. + + Licensed under the Flora License, Version 1.1 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://floralicense.org/license/ + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/setup.py b/setup.py index 98f4ed8..b9806d2 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/test/suite.py b/test/suite.py index c2c7cd3..7132ce9 100644 --- a/test/suite.py +++ b/test/suite.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/test/test_dependency.py b/test/test_dependency.py index cf9fa0f..368097d 100644 --- a/test/test_dependency.py +++ b/test/test_dependency.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -23,7 +20,7 @@ import os import time import unittest -from tic.dependency import analyze_dependency +#from tic.dependency import analyze_dependency from tic.parser.repo_parser import RepodataParser from tic.repo import get_repodata_from_repos @@ -75,7 +72,7 @@ class DependencyTest(unittest.TestCase): def test_dependency(self): # 1st package install-depdency analysis - analyze_dependency(self.pkg_group) + # analyze_dependency(self.pkg_group) # print('time:', current_milli_time() - start_time) pkg_list = self.pkg_group['pkg_list'] diff --git a/test/test_repodata.py b/test/test_repodata.py index fc36f8b..d23a2c7 100644 --- a/test/test_repodata.py +++ b/test/test_repodata.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/test/test_threadsafe.py b/test/test_threadsafe.py index 7fae0f8..526229f 100644 --- a/test/test_threadsafe.py +++ b/test/test_threadsafe.py @@ -1,8 +1,20 @@ -''' -Created on Mar 7, 2017 - -@author: shinchulwoo -''' +#!/usr/bin/python +# Copyright (c) 2016 Samsung Electronics Co., Ltd +# +# Licensed under the Flora License, Version 1.1 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://floralicense.org/license/ +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Contributors: +# - S-Core Co., Ltd import os import threading diff --git a/tic/command.py b/tic/command.py index 9388869..29d2245 100644 --- a/tic/command.py +++ b/tic/command.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/config.py b/tic/config.py index e2efc8a..4648f95 100644 --- a/tic/config.py +++ b/tic/config.py @@ -1,3 +1,20 @@ +#!/usr/bin/python +# Copyright (c) 2016 Samsung Electronics Co., Ltd +# +# Licensed under the Flora License, Version 1.1 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://floralicense.org/license/ +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Contributors: +# - S-Core Co., Ltd import os import ConfigParser diff --git a/tic/dependency.py b/tic/dependency.py index 64d29a0..5cab72e 100644 --- a/tic/dependency.py +++ b/tic/dependency.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/parser/recipe_parser.py b/tic/parser/recipe_parser.py index feb371b..2a48580 100644 --- a/tic/parser/recipe_parser.py +++ b/tic/parser/recipe_parser.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/parser/repo_parser.py b/tic/parser/repo_parser.py index 25a7ac0..d09979d 100644 --- a/tic/parser/repo_parser.py +++ b/tic/parser/repo_parser.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/parser/view_parser.py b/tic/parser/view_parser.py index 59603b4..c625931 100644 --- a/tic/parser/view_parser.py +++ b/tic/parser/view_parser.py @@ -1,3 +1,21 @@ +#!/usr/bin/python +# Copyright (c) 2016 Samsung Electronics Co., Ltd +# +# Licensed under the Flora License, Version 1.1 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://floralicense.org/license/ +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Contributors: +# - S-Core Co., Ltd + import logging import requests import re diff --git a/tic/pykickstarter.py b/tic/pykickstarter.py index 2e8d246..4a0fc3d 100644 --- a/tic/pykickstarter.py +++ b/tic/pykickstarter.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/pymic.py b/tic/pymic.py index 13a6e31..8a17b43 100644 --- a/tic/pymic.py +++ b/tic/pymic.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/repo.py b/tic/repo.py index ef508f5..de10826 100644 --- a/tic/repo.py +++ b/tic/repo.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -32,6 +29,14 @@ from tic.utils.grabber import myurlgrab2 from tic.utils import misc from tic.config import configmgr +REPOMD_EL_PRIMARY = 'primary' +REPOMD_EL_PATTERNS = 'patterns' +REPOMD_EL_COMPS = 'comps' +REPOMD_EL_GROUP = 'group' +REPOMD_EL_TYPE = 'type' +REPOMD_ATTRIB_LOCATION = '%slocation' +REPOMD_ATTRIB_LOCATION = '%sopen-checksum' + def _get_uncompressed_data_from_url(url, filename, proxies=None): # download file filename = myurlgrab2(url, filename) @@ -44,7 +49,7 @@ def _get_uncompressed_data_from_url(url, filename, proxies=None): filename = os.path.splitext(filename)[0] return filename -def _get_metadata_from_repo(baseurl, proxies, tempdir, cachedir, reponame, filehref, +def _get_repodata(baseurl, proxies, tempdir, cachedir, reponame, filehref, sumtype=None, checksum=None): logger = logging.getLogger(__name__) url = os.path.join(baseurl, filehref) @@ -73,7 +78,14 @@ def _get_metadata_from_repo(baseurl, proxies, tempdir, cachedir, reponame, fileh def get_repodata_from_repos(repos, cachedir): logger = logging.getLogger(__name__) - my_repodata = [] + + def _set_attrib(ns, key, element): + fpath_info[key] = element.find(''.join([ns, 'location'])).attrib['href'] + checksum = element.find(''.join([ns, 'open-checksum'])) + checksum_info[key] = checksum.text + sumtype_info[key] = checksum.attrib['type'] + + repodata = [] temp_path = os.path.join(cachedir, 'temp', str(misc.get_timestamp())) for repo in repos: reponame = repo.get('name') @@ -92,7 +104,7 @@ def get_repodata_from_repos(repos, cachedir): try: tree = etree.parse(repomd) - root = tree.getroot() + t_root = tree.getroot() except etree.XMLSyntaxError as e: logger.info(e) raise TICError(configmgr.message['xml_parse_error'] % ('repomd.xml', url)) @@ -101,50 +113,45 @@ def get_repodata_from_repos(repos, cachedir): repo_checksum = hashlib.sha256(open(repomd_file, 'rb').read()).hexdigest() cache_dir = os.path.join(cachedir, 'cached', base64url, repo_checksum) file.make_dirs(cache_dir) + + fpath_info = dict() + checksum_info = dict() + sumtype_info = dict() - ns = root.tag - ns = ns[0:ns.rindex("}")+1] - - filepaths = {} - checksums = {} - sumtypes = {} - - for elm in root.findall("%sdata" % ns): - if elm.attrib['type'] == 'patterns': - filepaths['patterns'] = elm.find("%slocation" % ns).attrib['href'] - checksums['patterns'] = elm.find("%sopen-checksum" % ns).text - sumtypes['patterns'] = elm.find("%sopen-checksum" % ns).attrib['type'] - elif elm.attrib['type'] == 'group': - filepaths['comps'] = elm.find("%slocation" % ns).attrib['href'] - checksums['comps'] = elm.find("%sopen-checksum" % ns).text - sumtypes['comps'] = elm.find("%sopen-checksum" % ns).attrib['type'] - elif elm.attrib["type"] == 'primary': - filepaths['primary'] = elm.find("%slocation" % ns).attrib['href'] - checksums['primary'] = elm.find("%sopen-checksum" % ns).text - sumtypes['primary'] = elm.find("%sopen-checksum" % ns).attrib['type'] + namespace = t_root.tag + namespace = namespace[0:namespace.rindex('}')+1] + + for element in t_root.findall(''.join([namespace, 'data'])): + if element.attrib[REPOMD_EL_TYPE] == REPOMD_EL_GROUP: + # group(comps) + _set_attrib(namespace, REPOMD_EL_COMPS, element) + else: + # type: primary, patterns + _set_attrib(namespace, element.attrib[REPOMD_EL_TYPE], element) - for item in ("primary", "patterns", "comps"): - if item not in filepaths: - filepaths[item] = None - continue - filepaths[item] = _get_metadata_from_repo(baseurl, - None, - temp_dir, - cache_dir, - reponame, - filepaths[item], - sumtypes[item], - checksums[item]) - my_repodata.append({"name":reponame, + for i_name in [REPOMD_EL_PRIMARY, REPOMD_EL_PATTERNS, REPOMD_EL_COMPS]: + if i_name in fpath_info: + fpath_info[i_name] = _get_repodata(baseurl, + None, + temp_dir, + cache_dir, + reponame, + fpath_info[i_name], + sumtype_info[i_name], + checksum_info[i_name]) + else: + fpath_info[i_name] = None + + repodata.append({"name":reponame, "baseurl":baseurl, "checksum":repo_checksum, "repomd":repomd, - "primary":filepaths['primary'], + "primary":fpath_info['primary'], "cachedir":cache_dir, "proxies":None, - "patterns":filepaths['patterns'], - "comps":filepaths['comps']}) - return my_repodata + "patterns":fpath_info['patterns'], + "comps":fpath_info['comps']}) + return repodata RepoType = collections.namedtuple('Repo', 'name, url') diff --git a/tic/server/tic_server.py b/tic/server/tic_server.py index d9613ad..51383ef 100644 --- a/tic/server/tic_server.py +++ b/tic/server/tic_server.py @@ -1,3 +1,21 @@ +#!/usr/bin/python +# Copyright (c) 2016 Samsung Electronics Co., Ltd +# +# Licensed under the Flora License, Version 1.1 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://floralicense.org/license/ +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Contributors: +# - S-Core Co., Ltd + import collections from flask import Flask from flask import Response diff --git a/tic/utils/error.py b/tic/utils/error.py index e74eddc..fc64cec 100644 --- a/tic/utils/error.py +++ b/tic/utils/error.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/utils/file.py b/tic/utils/file.py index 72911eb..12e70b9 100644 --- a/tic/utils/file.py +++ b/tic/utils/file.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/utils/grabber.py b/tic/utils/grabber.py index d0af5e8..0f886dd 100644 --- a/tic/utils/grabber.py +++ b/tic/utils/grabber.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/utils/log.py b/tic/utils/log.py index 370f1bb..084fff6 100644 --- a/tic/utils/log.py +++ b/tic/utils/log.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/utils/misc.py b/tic/utils/misc.py index c094e24..159c300 100644 --- a/tic/utils/misc.py +++ b/tic/utils/misc.py @@ -1,3 +1,21 @@ +#!/usr/bin/python +# Copyright (c) 2016 Samsung Electronics Co., Ltd +# +# Licensed under the Flora License, Version 1.1 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://floralicense.org/license/ +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Contributors: +# - S-Core Co., Ltd + import time get_timestamp = lambda: int(round(time.time() * 1000)) \ No newline at end of file diff --git a/tic/utils/process.py b/tic/utils/process.py index d376ed4..1ae1db0 100644 --- a/tic/utils/process.py +++ b/tic/utils/process.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tic/utils/rpmmisc.py b/tic/utils/rpmmisc.py index d53b28d..aa14c8e 100644 --- a/tic/utils/rpmmisc.py +++ b/tic/utils/rpmmisc.py @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tools/tic-core b/tools/tic-core index 8c24c8d..0bc0f7f 100644 --- a/tools/tic-core +++ b/tools/tic-core @@ -1,14 +1,11 @@ #!/usr/bin/python -# Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd. All rights reserved. +# Copyright (c) 2016 Samsung Electronics Co., Ltd # -# Contact: -# @author Chulwoo Shin -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Flora License, Version 1.1 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://floralicense.org/license/ # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, -- 2.7.4