Merge branch 'master' of ssh://git.fedorahosted.org/git/releng

4 files changed, 20 insertions, 25 deletions

diff --git a/scripts/upgradecheck/README b/scripts/upgradecheck/README
index e9f6c4d..5559ca0 100644
--- a/scripts/upgradecheck/README
+++ b/scripts/upgradecheck/README
@@ -1,5 +1,5 @@
 To generate an upgrade check report, run this:
 
-sudo ./upgradecheck.py -c upgradecheck-core+extras.conf -n -w -x
+sudo ./upgradecheck.py -c upgradecheck.conf -n -w -x
 
-If you want to include packages they may be missing from F7 repos but are in F6 repos, add a -m parameter to the above.
+If you want to include packages they may be missing from F9 repos but are in F8 repos, add a -m parameter to the above.
diff --git a/scripts/upgradecheck/upgradecheck-core+extras.conf b/scripts/upgradecheck/upgradecheck-core+extras.conf
deleted file mode 100644
index 966bb39..0000000
--- a/scripts/upgradecheck/upgradecheck-core+extras.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-[main]
-metadata_expire=0
-keepcache=0
-reposdir=
-
-[FC6]
-name=FC6
-baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/6/source/SRPMS/
-
-[F7]
-name=F7
-baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/source/SRPMS/
-
-[FC6-updates]
-name=FC6-updates
-baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/6/SRPMS/
-
-[FE6]
-name=FE6
-baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/6/SRPMS/
-#baseurl=file:///srv/rpmbuild/extras/tree/extras/6/SRPMS/
diff --git a/scripts/upgradecheck/upgradecheck.conf b/scripts/upgradecheck/upgradecheck.conf
new file mode 100644
index 0000000..5a6904d
--- /dev/null
+++ b/scripts/upgradecheck/upgradecheck.conf
@@ -0,0 +1,16 @@
+[main]
+metadata_expire=0
+keepcache=0
+reposdir=
+
+[F8]
+name=F8
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/8/Everything/source/SRPMS/
+
+[F9]
+name=F9
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/
+
+[F8-updates]
+name=F8-updates
+baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/8/SRPMS/
diff --git a/scripts/upgradecheck/upgradecheck.py b/scripts/upgradecheck/upgradecheck.py
index af98af1..8a47188 100755
--- a/scripts/upgradecheck/upgradecheck.py
+++ b/scripts/upgradecheck/upgradecheck.py
@@ -42,7 +42,7 @@ smtp_server = None
 # and all repos containing that number in their id's will be associated with
 # the corresponding distro version.  For example, repo id "foo9bar" will be
 # associated with distro "9".
-dists = ('4', '5', '6', '7')
+dists = ('8', '9')
 
 # Architectures to operate on.
 archs = rpmUtils.arch.getArchList('src')
@@ -107,7 +107,7 @@ class MySolver(yum.YumBase):
 def evrstr(evr):
     return evr and "%s:%s-%s" % evr or "(missing)"
 
-def koji_get_info(name, report, pkg_evr, tags=["dist-fc7", "f7-final", "dist-fc7-updates-candidate"]):
+def koji_get_info(name, report, pkg_evr, tags=["dist-rawhide"]):
     koji_server = "http://koji.fedoraproject.org/kojihub"
     koji_session = koji.ClientSession(koji_server, {})
     fmt = "     %(nvr)-40s %(tag_name)-20s %(owner_name)s"