summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStewart Adam <admin@Diffingo.localdomain>2007-10-17 00:02:33 (GMT)
committerStewart Adam <admin@Diffingo.localdomain>2007-10-17 00:02:33 (GMT)
commit7d5e27dbe4bdb4157300c6e20e633f0e65501165 (patch)
tree5e361a812add603d7c12ab32b99090187f03a2ed
parent7eacac855f236970e420cb7402304eda74d05197 (diff)
downloadpyjigdo-7d5e27dbe4bdb4157300c6e20e633f0e65501165.zip
pyjigdo-7d5e27dbe4bdb4157300c6e20e633f0e65501165.tar.gz
pyjigdo-7d5e27dbe4bdb4157300c6e20e633f0e65501165.tar.xz
Debug...
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rwxr-xr-xpyjigdo.py8
-rw-r--r--pyjigdo.spec.in14
-rw-r--r--pyjigdo/image.py7
5 files changed, 28 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5689449..12cb236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-10 Stewart Adam <s.adam@diffingo.com>
+ * Split up files
+ * Relicense to GPLv2+
+
2007-10-06 Jonathan Steffan <jon@fedoraunity.org>
* Check-in from gobby session(s). Time to start making
everything work.
diff --git a/configure.ac b/configure.ac
index 7c77a00..dbdb405 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pyjigdo], 0.1)
+AC_INIT([pyjigdo], 0.2)
AC_CONFIG_SRCDIR(pyjigdo/__init__.py.in)
#ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms nb nl or pa pl pt pt_BR ru sk sl sr@Latn sr sv ta tr uk zh_CN zh_TW"
diff --git a/pyjigdo.py b/pyjigdo.py
index d8ab993..ba322e0 100755
--- a/pyjigdo.py
+++ b/pyjigdo.py
@@ -462,6 +462,14 @@ if building_images:
iso_image_file.mount()
test_jobs.scan_dir(iso_image_file.location)
iso_image_file.umount()
+ """for iso_image in test_jobs.images:
+ ## Ok, we have iso_image which is an ISOImage object ready to go. Just an example.
+ ## We would want this to go into a queue and be blown away by threads ;-)
+ print "Downloading needed slices for %s..." % iso_image.location
+ num_download = len(iso_image.image_slices.keys()) + 1
+ for num, image_slice in enumerate(iso_image.image_slices.iterkeys()):
+ print iso_image.image_slices[image_slice]"""
+ # ^ = all false... so it's after here
test_jobs.checkISOslices()
test_jobs.run(options.download_threads)
diff --git a/pyjigdo.spec.in b/pyjigdo.spec.in
index 276bf29..075506a 100644
--- a/pyjigdo.spec.in
+++ b/pyjigdo.spec.in
@@ -3,19 +3,20 @@
Summary: Python version of Jigdo, Modified
Name: pyjigdo
Version: @VERSION@
-Release: 2.alpha%{?dist}
-License: GPLv2
+Release: 1.alpha%{?dist}
+License: GPLv2+
Group: Applications/System
URL: https://hosted.fedoraproject.org/projects/pyjigdo
Source0: http://files.pyjigdo.fedoraunity.org/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: jigdo
+# this is because we use /var/tmp/jigdo
BuildArch: noarch
BuildRequires: intltool, gettext, python, diffutils
%description
-PyJigdo is a slightly modified version of the popular Jigdo distribution
-framework.
+PyJigdo is a Python rewrite of the popular Jigdo distribution framework. It has
+also been slightly modified to add some extra features.
%prep
%setup -q
@@ -43,6 +44,11 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/pyjigdo/pyjigdo.conf
%changelog
+* Wed Oct 10 2007 Stewart Adam <s.adam a diffingo.com> 0.2-1
+- Split up py files
+- License change from GPLv2 to GPLv2+
+- Make __init__.py's __version__ work based on automake
+
* Tue Oct 09 2007 Jonathan Steffan <jon a fedoraunity.org> 0.1-2
- Updated spec to build for alpha test release
diff --git a/pyjigdo/image.py b/pyjigdo/image.py
index 5d3a564..3fc087b 100644
--- a/pyjigdo/image.py
+++ b/pyjigdo/image.py
@@ -161,6 +161,7 @@ class ISOImage:
return True
template_data = run_command(["jigdo-file", "ls", "--template", template_tmp_file], inshell=True)
slices = [line.split()[3] for line in template_data
+ # FIXME: What is this!?
if line.startswith('have-file')]
for slice_md5 in slices:
if slice_md5 in template_slices.slices:
@@ -180,7 +181,8 @@ def download_slice(slice_md5, current_num, num_download, jigdo_config, template_
if os.path.isfile(local_location):
if compare_sum(local_location, slice_object.slice_sum):
print "[%s/%s] %s is complete, skipping." % (current_num, num_download, local_location)
- if iso_image: iso_image.image_slices[slice_md5] = True
+ if iso_image:
+ iso_image.image_slices[slice_md5] = True
slice_object.finished = True
slice_object.location = local_location
return
@@ -191,7 +193,8 @@ def download_slice(slice_md5, current_num, num_download, jigdo_config, template_
try:
print "[%s/%s] Trying to download %s: \n\t --> %s" % (current_num, num_download, url, local_location)
urlgrab(url, filename=local_location, progress_obj=TextMeter())
- if iso_image: iso_image.image_slices[slice_md5] = True
+ if iso_image:
+ iso_image.image_slices[slice_md5] = True
slice_object.finished = True
slice_object.location = local_location
source.fallback_urls[url] = "200"