- catch srpm not found traceback

- fix fc4 config files

4 files changed, 28 insertions, 4 deletions

diff --git a/etc/fedora-4-i386-core.cfg b/etc/fedora-4-i386-core.cfg
index e0e5403..6bdc6e3 100644
--- a/etc/fedora-4-i386-core.cfg
+++ b/etc/fedora-4-i386-core.cfg
@@ -35,7 +35,13 @@ assumeyes=1
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/4/i386
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/4/i386/os/
+
+
+[updates-released]
+name=updates
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/4/i386/
+
 
 [groups]
 name=groups
diff --git a/etc/fedora-4-ppc-core.cfg b/etc/fedora-4-ppc-core.cfg
index cefd55b..b3229a7 100644
--- a/etc/fedora-4-ppc-core.cfg
+++ b/etc/fedora-4-ppc-core.cfg
@@ -34,7 +34,12 @@ assumeyes=1
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/4/ppc
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/4/ppc/os
+
+
+[updates-released]
+name=updates
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/4/ppc/
 
 [groups]
 name=groups
diff --git a/etc/fedora-4-x86_64-core.cfg b/etc/fedora-4-x86_64-core.cfg
index bb61171..d6b6e7b 100644
--- a/etc/fedora-4-x86_64-core.cfg
+++ b/etc/fedora-4-x86_64-core.cfg
@@ -36,7 +36,13 @@ exclude=*.i386 *.486 *.586 *.i686 *.athlon
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/4/x86_64
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/4/x86_64/os/
+
+
+[updates-released]
+name=updates
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/4/x86_64/
+
 
 [groups]
 name=groups
diff --git a/mock.py b/mock.py
index 6da04f0..2ced01b 100644
--- a/mock.py
+++ b/mock.py
@@ -631,14 +631,21 @@ def main():
     if len(args) < 1:
         error("No srpm specified - nothing to do")
         sys.exit(50)
+        
     
     srpm = args[0] # we only take one and I don't care. :)
     ts = rpmUtils.transaction.initReadOnlyTransaction()
-    hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm)
+    try:
+        hdr = rpmUtils.miscutils.hdrFromPackage(ts, srpm)
+    except rpmUtils.RpmUtilsError, e:
+        error("Specified srpm %s cannot be found/opened" % srpm)
+        sys.exit(50)
+
     if hdr[rpm.RPMTAG_SOURCEPACKAGE] != 1:
         error("Specified srpm isn't a srpm!  Can't go on")
         sys.exit(50)
     
+    
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)