diff options
-rw-r--r-- | pym/portage/package/ebuild/fetch.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py index 973ddaf5..1fe055ac 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -224,12 +224,12 @@ _size_suffix_map = { def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",use_locks=1, try_mirrors=1): "fetch files. Will use digest file if available." - use_twrapper_to_download = ("USE_TWRAPPER" in mysettings) and fetchonly; - if use_twrapper_to_download: + use_seggetd_to_download = ("USE_SEGGETD" in mysettings) and fetchonly; + if use_seggetd_to_download: # print("mysettings[DISTDIR]: ",mysettings["DISTDIR"]) # TO-DO: wait for release of lock_file, create lock_file, load file, unlink lock_file - idfetch_pkg_list_file_name=mysettings['USE_TWRAPPER']+"/var/pkg.list" - print("Using TWRAPPER. Saving pkg_list.list file to ",idfetch_pkg_list_file_name) + idfetch_pkg_list_file_name=mysettings['USE_SEGGETD']+"/pkg.list" + print("Using seggetd daemon. Saving pkg_list.list file to ",idfetch_pkg_list_file_name) try: idfetch_pkg_list_file = open(idfetch_pkg_list_file_name,"r") idfetch_pkg_list=json.loads(idfetch_pkg_list_file.read()) @@ -248,7 +248,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", idfetch_pkg_list.remove(cur_pkg) idfetch_pkg_list.append(idfetch_pkg) else: - print("To use twrapper: set USE_TWRAPPER=\"your_twrapper_dir\" in /etc/make.conf") + print("To use seggetd daemon: set USE_SEGGETD=\"your_twrapper_dir\" in /etc/make.conf") if not myuris: return 1 @@ -799,7 +799,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", eout.eend(0) continue # fetch any remaining files - if use_twrapper_to_download: + if use_seggetd_to_download: #check for duplicates has_duplicate=0 for cur_pkg in idfetch_pkg_list: @@ -1191,13 +1191,13 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", return 0 # TO-DO: wait for release of lock_file, create lock_file, save file, unlink lock_file - if use_twrapper_to_download: + if use_seggetd_to_download: try: idfetch_pkg_list_file = open(idfetch_pkg_list_file_name,"w") idfetch_pkg_list_file.write(json.dumps(idfetch_pkg_list, sort_keys=1, indent=4)) idfetch_pkg_list_file.close() except: - print("Error saving tasks to: ",idfetch_pkg_list_file) + print("Error saving tasks to: ",idfetch_pkg_list_file_name) if failed_files: return 0 |