Page MenuHomeSoftware Heritage
Files F9125503

No OneTemporary
Actions

View Options

diff --git a/PKG-INFO b/PKG-INFO
index 313d7e1..0c65a43 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,10 +1,10 @@
Metadata-Version: 1.0
Name: swh.loader.dir
-Version: 0.0.19
+Version: 0.0.20
Summary: Software Heritage Directory Loader
Home-page: https://forge.softwareheritage.org/diffusion/DLDDIR
Author: Software Heritage developers
Author-email: swh-devel@inria.fr
License: UNKNOWN
Description: UNKNOWN
Platform: UNKNOWN
diff --git a/debian/control b/debian/control
index c107adb..b907ae0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,23 @@
Source: swh-loader-dir
Maintainer: Software Heritage developers <swh-devel@inria.fr>
Section: python
Priority: optional
Build-Depends: debhelper (>= 9),
dh-python,
python3-all,
python3-nose,
python3-setuptools,
python3-swh.core (>= 0.0.14~),
python3-swh.model (>= 0.0.10~),
python3-swh.scheduler,
python3-swh.storage (>= 0.0.31~),
- python3-swh.loader.core (>= 0.0.8~),
+ python3-swh.loader.core (>= 0.0.9~),
python3-vcversioner
Standards-Version: 3.9.6
Homepage: https://forge.softwareheritage.org/diffusion/DLDDIR/
Package: python3-swh.loader.dir
Architecture: all
Depends: ${misc:Depends},
${python3:Depends}
Description: Software Heritage Directory Loader
diff --git a/requirements.txt b/requirements.txt
index c3ef19f..cd4e9c4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
# Add here external Python modules dependencies, one per line. Module names
# should match https://pypi.python.org/pypi names. For the full spec or
# dependency lines, see https://pip.readthedocs.org/en/1.1/requirements.html
vcversioner
swh.core >= 0.0.14
swh.model >= 0.0.10
swh.scheduler
swh.storage >= 0.0.31
-swh.loader.core >= 0.0.8
+swh.loader.core >= 0.0.9
retrying
diff --git a/swh.loader.dir.egg-info/PKG-INFO b/swh.loader.dir.egg-info/PKG-INFO
index 313d7e1..0c65a43 100644
--- a/swh.loader.dir.egg-info/PKG-INFO
+++ b/swh.loader.dir.egg-info/PKG-INFO
@@ -1,10 +1,10 @@
Metadata-Version: 1.0
Name: swh.loader.dir
-Version: 0.0.19
+Version: 0.0.20
Summary: Software Heritage Directory Loader
Home-page: https://forge.softwareheritage.org/diffusion/DLDDIR
Author: Software Heritage developers
Author-email: swh-devel@inria.fr
License: UNKNOWN
Description: UNKNOWN
Platform: UNKNOWN
diff --git a/swh.loader.dir.egg-info/requires.txt b/swh.loader.dir.egg-info/requires.txt
index 011b7b2..73f4465 100644
--- a/swh.loader.dir.egg-info/requires.txt
+++ b/swh.loader.dir.egg-info/requires.txt
@@ -1,7 +1,7 @@
retrying
swh.core>=0.0.14
-swh.loader.core>=0.0.8
+swh.loader.core>=0.0.9
swh.model>=0.0.10
swh.scheduler
swh.storage>=0.0.31
vcversioner
diff --git a/swh/loader/dir/tasks.py b/swh/loader/dir/tasks.py
index c4b7c25..093c592 100644
--- a/swh/loader/dir/tasks.py
+++ b/swh/loader/dir/tasks.py
@@ -1,35 +1,34 @@
# Copyright (C) 2015-2016 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
from swh.loader.dir.loader import DirLoader
from swh.loader.core import tasks
class LoadDirRepository(tasks.LoaderCoreTask):
"""Import a directory to Software Heritage
"""
+ CONFIG_BASE_FILENAME = 'loader/dir.ini'
task_queue = 'swh_loader_dir'
def run(self, dir_path, origin, revision, release, occurrences):
"""Import a directory.
Args:
cf. swh.loader.dir.loader.run docstring
"""
- storage = DirLoader(origin_id=None).storage
+ origin['id'] = self.storage.origin_add_one(origin)
- origin['id'] = storage.origin_add_one(origin)
-
- fetch_history_id = self.open_fetch_history(storage, origin['id'])
+ fetch_history_id = self.open_fetch_history(origin['id'])
result = DirLoader(origin['id']).process(dir_path,
origin,
revision,
release,
occurrences)
- self.close_fetch_history(storage, fetch_history_id, result)
+ self.close_fetch_history(fetch_history_id, result)
diff --git a/version.txt b/version.txt
index fc331dc..79652d6 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v0.0.19-0-g2e00512
\ No newline at end of file
+v0.0.20-0-g9177236
\ No newline at end of file

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jun 21, 8:58 PM (3 w, 6 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3333135

Event Timeline

About · Developer information · Legal