proxy = None
if url:
- proxy = get_proxy_for(url)
+ proxy = get_proxy_for(url)
else:
- proxy = get_proxy_for(self.urls[0])
+ proxy = get_proxy_for(self.urls[0])
if proxy:
- self.proxy = str(proxy)
+ self.proxy = str(proxy)
size = int(size) if size else None
rvalue = super(MyYumRepository, self)._getFile(url,
return True;
else:
if startx and name.endswith(pkg[1:]):
- return True;
+ return True;
if endx and name.startswith(pkg[:-1]):
- return True;
+ return True;
return False;
def _add_prob_flags(self, *flags):
for flag in flags:
- if flag not in self.probFilterFlags:
- self.probFilterFlags.append(flag)
+ if flag not in self.probFilterFlags:
+ self.probFilterFlags.append(flag)
def get_proxies(self, pobj):
if not pobj:
@classmethod
def do_chroot(self, target, cmd=[]):#chroot.py parse opts&args
- try:
- if len(cmd) != 0:
- cmdline = ' '.join(cmd)
- else:
- cmdline = "/bin/bash"
- envcmd = fs_related.find_binary_inchroot("env", target)
- if envcmd:
- cmdline = "%s HOME=/root %s" % (envcmd, cmdline)
- chroot.chroot(target, None, cmdline)
- finally:
- chroot.cleanup_after_chroot("dir", None, None, None)
- return 1
-
+ try:
+ if len(cmd) != 0:
+ cmdline = ' '.join(cmd)
+ else:
+ cmdline = "/bin/bash"
+ envcmd = fs_related.find_binary_inchroot("env", target)
+ if envcmd:
+ cmdline = "%s HOME=/root %s" % (envcmd, cmdline)
+ chroot.chroot(target, None, cmdline)
+ finally:
+ chroot.cleanup_after_chroot("dir", None, None, None)
+ return 1
try:
subprocess.call(args, preexec_fn = instance._chroot)
except OSError, (err, msg):
- raise errors.CreatorError("Failed to execute /usr/libexec/mkliveinitrd: %s" % msg)
+ raise errors.CreatorError("Failed to execute /usr/libexec/mkliveinitrd: %s" % msg)
def __run_post_cleanups(instance):
kernelver = instance._get_kernel_versions().values()[0][0]
try:
subprocess.call(args, preexec_fn = instance._chroot)
except OSError, (err, msg):
- raise errors.CreatorError("Failed to run post cleanups: %s" % msg)
+ raise errors.CreatorError("Failed to run post cleanups: %s" % msg)
convertoropts = configmgr.convert
convertoropts['name'] = os.path.splitext(os.path.basename(base_on))[0]
subprocess.call(args, preexec_fn = instance._chroot)
except OSError, (err, msg):
- raise errors.CreatorError("Failed to execute /usr/libexec/mkliveinitrd: %s" % msg)
+ raise errors.CreatorError("Failed to execute /usr/libexec/mkliveinitrd: %s" % msg)
def __run_post_cleanups(instance):
kernelver = instance._get_kernel_versions().values()[0][0]
try:
subprocess.call(args, preexec_fn = instance._chroot)
except OSError, (err, msg):
- raise errors.CreatorError("Failed to run post cleanups: %s" % msg)
+ raise errors.CreatorError("Failed to run post cleanups: %s" % msg)
convertoropts = configmgr.convert
convertoropts['name'] = os.path.splitext(os.path.basename(base_on))[0]