Kaydet (Commit) 3033d0ee authored tarafından Suleyman Poyraz's avatar Suleyman Poyraz

Last Changes: firmware analyzer added, strutils added, fixed name problem(bir…

Last Changes: firmware analyzer added, strutils added, fixed name problem(bir daha paket yöneticisinin isimini degistirenin elini kıracam), cosmetical fixes
üst 8e7cee37
2018-01-07 Suleyman Poyraz <nipalensisaquila@gmail.com>
* System modulleri silindi:
Inary içinde onlara ihtiyaç olmadığını farkettim. Scom içine alarak yer
kazandım.
* inary/strutils.py:
Str veri tipi için basit tipte fonksiyonları ve multisplit gibi şeyleri
içeren bir modul.
2018-01-04 Suleyman Poyraz <nipalensisaquila@gmail.com>
* Kozmetik fixler ve düzenlemeler yapıldı(developing branch)
* Dokumantasyon taslakları yazıldı.(developing branch)
* Merge Developing branch into master on 2018-01-07
2018-01-29 Suleyman Poyraz <nipalensisaquila@gmail.com>
* Gereksiz toolar temizlendi:
Bazıları ismail abiye yüklenecek, İsmail abi kim mi?
......
2018-01-26 Suleyman POYRAZ <nipalensisaquila@gmail.com>
* inary/sxml/xmlext --- STATUS: NOT FIXED; FLAG: NOT CRITICAL ---:
* inary/sxml/xmlext --- status: not fixed; flag: cosmetical ---:
xmlext modulunde bulunan getNodeText olayinda ciktilar utf-8 ile
decode edilmeli. Yoksa Localtext ve Text type veriler ile ilgili sorun
cıkıyor
2018-01-14 Suleyman POYRAZ <nipalensisaquila@gmail.com>
* inary/atomicoperations.py --- STATUS: NOT FIXED ---
* inary/atomicoperations.py --- status: not fixed flag: critical ---
In removing not asking "Do you want remove conflicted files "
Now remove all package files and conflicted files
"Wrote by old Pardus developer Eray Özkural"
HISTORY OF THE DEVELOPMENT BRANCH FORK
======================================
1. Introduction
PISI was the Pardus Linux package manager, I wrote most of it while
......
# -*- coding: utf-8 -*-
#
# Copyright (C) 2018, Suleyman POYRAZ (Zaryob)
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 of the License, or (at your option)
# any later version.
#
# Please read the COPYING file.
#
# -*- coding: utf-8 -*-
#
# Copyright (C) 2018, Suleyman POYRAZ (Zaryob)
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 of the License, or (at your option)
# any later version.
#
# Please read the COPYING file.
#
import os
import sys
import inary
import inary.context as ctx
import inary.util
#Gettext
import gettext
__trans = gettext.translation('inary', fallback=True)
_ = __trans.gettext
FW_PATH = "/lib/firmware"
INSTALDB = inary.db.installdb.InstallDB()
COMPONENTDB = inary.db.componentdb.ComponentDB()
class Error(inary.Error):
pass
def get_firmwares():
ctx.ui.info(inary.util.colorize("Extracting firmware list for {}...".format(os.uname()[2]), "green"))
d = {}
modules = [os.path.basename(mod.replace(".ko", "")) for mod in \
os.popen("modprobe -l").read().strip().split("\n")]
for mod in modules:
fws = os.popen("modinfo -F firmware {}".format(mod)).read().strip()
if fws:
try:
d[mod].extend(fws.split("\n"))
except KeyError:
d[mod] = fws.split("\n")
return d
def get_firmware_package(firmware):
try:
fw_packages = COMPONENTDB.get_packages("hardware.firmware")
unavailable_fw_packages = set(fw_packages).difference(INSTALLDB.list_installed())
if unavailable_fw_packages:
ctx.ui.info(inary.util.colorize("The following firmwares are not installed:", "yellow"))
ctx.ui.info("\n".join(unavailable_fw_packages))
for module, firmwares in list(get_firmwares().items()):
ctx.ui.info("\n {} requires the following firmwares:".format(module))
for fw in firmwares:
ctx.ui.info(" * {}".format(fw), noln = True)
try:
firmware = inary.api.search_file(fw)[0][0]
except:
pass
ctx.ui.info(" ({})".format(inary.util.colorize(firmware, 'green') if firmware else \
inary.util.colorize("missing", 'red')))
except:
raise Error()
# -*- coding: utf-8 -*-
#
# Copyright (C) 2018, Suleyman POYRAZ (Zaryob)
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 of the License, or (at your option)
# any later version.
#
# Please read the COPYING file.
#
"""string/list/functional utility functions"""
import operator
from functools import reduce
def every(pred, seq):
return reduce(operator.and_, list(map(pred, seq)), True)
def any(pred, seq):
return reduce(operator.or_, list(map(pred, seq)), False)
def unzip(seq):
return list(zip(*seq))
def concat(l):
"""Concatenate a list of lists."""
return reduce( operator.concat, l )
def strlist(l):
"""Concatenate string reps of l's elements."""
return "".join([str(x) + ' ' for x in l])
def multisplit(str, chars):
"""Split str with any of the chars."""
l = [str]
for c in chars:
l = concat([x.split(c) for x in l])
return l
def same(l):
"""Check if all elements of a sequence are equal."""
if len(l)==0:
return True
else:
last = l.pop()
for x in l:
if x!=last:
return False
return True
def prefix(a, b):
"""Check if sequence a is a prefix of sequence b."""
if len(a)>len(b):
return False
for i in range(0,len(a)):
if a[i]!=b[i]:
return False
return True
def remove_prefix(a,b):
"""Remove prefix a from sequence b."""
assert prefix(a,b)
return b[len(a):]
def human_readable_size(size = 0):
symbols, depth = [' B', 'KB', 'MB', 'GB'], 0
while size > 1000 and depth < 3:
size = float(size / 1024)
depth += 1
return size, symbols[depth]
def human_readable_rate(size = 0):
x = human_readable_size(size)
return x[0], x[1] + '/s'
def ascii_lower(str):
"""Ascii only version of string.lower()"""
trans_table = str.maketrans(str.ascii_uppercase, str.ascii_lowercase)
return str.translate(trans_table)
def ascii_upper(str):
"""Ascii only version of string.upper()"""
trans_table = str.maketrans(str.ascii_lowercase, str.ascii_uppercase)
return str.translate(trans_table)
......@@ -903,3 +903,102 @@ def letters():
result.append(start + "-" + end)
start = None
return ''.join(result)
def get_kernel_option(option):
"""Get a dictionary of args for the given kernel command line option"""
args = {}
try:
cmdline = open("/proc/cmdline").read().split()
except IOError:
return args
for cmd in cmdline:
if "=" in cmd:
optName, optArgs = cmd.split("=", 1)
else:
optName = cmd
optArgs = ""
if optName == option:
for arg in optArgs.split(","):
if ":" in arg:
k, v = arg.split(":", 1)
args[k] = v
else:
args[arg] = ""
return args
def get_cpu_count():
"""
This function part of portage
Copyright 2015 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2
Using:
Try to obtain the number of CPUs available.
@return: Number of CPUs or None if unable to obtain.
"""
try:
import multiprocessing
return multiprocessing.cpu_count()
except (ImportError, NotImplementedError):
return None
def get_vm_info():
vm_info = {}
try:
import subprocess
except ImportError:
raise Exception(_("Module: \"subprocess\" can not import"))
if platform.system() == 'Linux':
try:
proc = subprocess.Popen(["free"],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
except OSError:
pass
output = proc.communicate()[0].decode('utf-8')
if proc.wait() == os.EX_OK:
for line in output.splitlines():
line = line.split()
if len(line) < 2:
continue
if line[0] == "Mem:":
try:
vm_info["ram.total"] = int(line[1]) * 1024
except ValueError:
pass
if len(line) > 3:
try:
vm_info["ram.free"] = int(line[3]) * 1024
except ValueError:
pass
elif line[0] == "Swap:":
try:
vm_info["swap.total"] = int(line[1]) * 1024
except ValueError:
pass
if len(line) > 3:
try:
vm_info["swap.free"] = int(line[3]) * 1024
except ValueError:
pass
else:
try:
proc = subprocess.Popen(["sysctl", "-a"],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
except OSError:
pass
else:
output = proc.communicate()[0].decode('utf-8')
if proc.wait() == os.EX_OK:
for line in output.splitlines():
line = line.split(":", 1)
if len(line) != 2:
continue
plyvel  
psutil
pyliblzma
git+https://github.com/AquilaNipalensis/iksemel.git
git+https://github.com/AquilaNipalensis/SCOM.git
filemagic
git+https://github.com/Zaryob/scom-api.git
git+https://github.com/Zaryob/ciksemel.git
git+https://github.com/Zaryob/catbox.git
......@@ -8,7 +8,7 @@
#
# Problem Description:
#
# spam updates strict reverse deps if the reverse deps dependencies are not satisfied. For example if kernel is tried
# inary updates strict reverse deps if the reverse deps dependencies are not satisfied. For example if kernel is tried
# to be upgraded all the reverse deps are forced to be upgraded automatically. When only one rev-dep module is
# selected for an upgrade, kernel also comes as a strict dep for this module. But when kernel comes, all the rev-deps
# should come with kernel, too. It is not coming.
......@@ -21,7 +21,7 @@
# rev-deps of all the calculated to be upgraded packages should come
from spam.scenarioapi.scenario import *
from inary.scenarioapi.scenario import *
MODULE_ALSA_DRIVER = "module-alsa-driver"
MODULE_FGLRX = "module-fglrx"
......@@ -31,11 +31,11 @@ let_repo_had(KERNEL, with_version("2.6.30"))
let_repo_had(MODULE_ALSA_DRIVER, with_added_dependency(KERNEL, version="2.6.30"))
let_repo_had(MODULE_FGLRX, with_added_dependency(KERNEL, version="2.6.30"))
let_spam_had(KERNEL, MODULE_ALSA_DRIVER, MODULE_FGLRX)
let_inary_had(KERNEL, MODULE_ALSA_DRIVER, MODULE_FGLRX)
def run():
repo_version_bumped(KERNEL, with_version("2.6.31"))
repo_version_bumped(MODULE_ALSA_DRIVER, with_added_dependency(KERNEL, version="2.6.31"))
repo_version_bumped(MODULE_FGLRX, with_added_dependency(KERNEL, version="2.6.31"))
repo_updated_index()
spam_upgraded(MODULE_FGLRX)
inary_upgraded(MODULE_FGLRX)
......@@ -7,13 +7,13 @@
# Problem : If the revdep of the "upgraded only packages"' dependency is not satisfied
# it is also added to the upgrade list and creates "confusion"
#
# # spam lu
# # inary lu
# amarok - KDE için müzik çalıcısı
# ksynaptics - Synaptics touchpad yapılandırma aracı
# libwmf - Microsoft Word gibi uygulamaların kullan.....
# tunepimp - MusicBrainz uyumluluğu olan uygulamalar.......
#
# spam up tunepimp libwmf ksynaptics
# inary up tunepimp libwmf ksynaptics
# Depolar güncelleniyor
# * pardus-1.1 deposu güncelleniyor
# pardus-1.1 deposu için güncelleme yok.
......@@ -29,10 +29,10 @@
#
# Expected:
#
# spam either should not upgrade packages out of the given upgrade list or should show
# inary either should not upgrade packages out of the given upgrade list or should show
# all the "to be upgraded" list before the conflict warning.
from spam.scenarioapi.scenario import *
from inary.scenarioapi.scenario import *
AMAROK = "amarok"
KSYNAPTICS = "ksynaptics"
......@@ -46,7 +46,7 @@ let_repo_had(TUNEPIMP, with_version("0.3.9"))
let_repo_had(KSYNAPTICS)
let_repo_had(LIBWMF)
let_spam_had(AMAROK, LASTFM, TUNEPIMP, KSYNAPTICS, LIBWMF)
let_inary_had(AMAROK, LASTFM, TUNEPIMP, KSYNAPTICS, LIBWMF)
def run():
repo_version_bumped(TUNEPIMP, with_version("0.4.1"))
......@@ -54,4 +54,4 @@ def run():
repo_version_bumped(KSYNAPTICS)
repo_version_bumped(LIBWMF)
repo_updated_index()
spam_upgraded(LIBWMF, TUNEPIMP, KSYNAPTICS)
inary_upgraded(LIBWMF, TUNEPIMP, KSYNAPTICS)
......@@ -4,9 +4,9 @@
#
# Source : http://bugs.pardus.org.tr/show_bug.cgi?id=3390
#
# Problem : Package reverse dependencies are not updated in spam database
# Problem : Package reverse dependencies are not updated in inary database
#
# caglar@zangetsu ~ $ spam info valgrind
# caglar@zangetsu ~ $ inary info valgrind
# Yüklü paket:
# Ad: valgrind, versiyon 3.2.0, sürüm 5, inşa 4
# Özet: Valgrind, x86-GNU/Linux ve ppc-GNU/Linux için geliştirilmiş, bellek
......@@ -24,7 +24,7 @@
#
# Valgrind package had a dependency of openmpi package. It is version bumped with removed
# dependeny of openmpi at the repository. Also openmpi is version bumped. After upgrading
# spam repository and trying to remove openmpi, it is seen that openmpi still has a reverse
# inary repository and trying to remove openmpi, it is seen that openmpi still has a reverse
# dependency of valgrind.
#
# Expected:
......@@ -32,18 +32,18 @@
# Pisi should have updated the reverse dependency informations correctly and should not show
# a reverse dependency of valgrind while removing openmpi, after a succesfull repository upgrade.
from spam.scenarioapi.scenario import *
from inary.scenarioapi.scenario import *
VALGRIND = "valgrind"
OPENMPI = "openmpi"
let_repo_had(VALGRIND, with_dependencies(OPENMPI))
let_repo_had(OPENMPI)
let_spam_had(VALGRIND, OPENMPI)
let_inary_had(VALGRIND, OPENMPI)
def run():
repo_version_bumped(VALGRIND, with_removed_dependencies(OPENMPI))
repo_version_bumped(OPENMPI)
repo_updated_index()
spam_upgraded()
spam_removed(OPENMPI)
inary_upgraded()
inary_removed(OPENMPI)
......@@ -6,18 +6,18 @@
#
# Problem : Pisi does not warn the user about updated packages in the repository.
#
# sudo spam it wormux --reinstall
# sudo inary it wormux --reinstall
# Bağımlılıkları sağlamak için bu paketler verilen sırada kurulacaktır:
# wormux
# Paketlerin toplam boyu: 17.62 MB
# Paket wormux, pardus-1.1 deposunda bulundu
# Program sonlandırıldı.
# http://paketler.pardus.org.tr/pardus-1.1/wormux-0.7-2-1.spam indirilemiyor; HTTP
# http://paketler.pardus.org.tr/pardus-1.1/wormux-0.7-2-1.inary indirilemiyor; HTTP
# Error 404: Not Found
#
# Problem Description:
#
# The user had not updated spam's repository database for some time. Then, when pisi is asked
# The user had not updated inary's repository database for some time. Then, when pisi is asked
# to reinstall an installed package, it failed to fetch the requested version of the package.
# Because the package had been upgraded at the repository and the old package has been removed.
#
......@@ -25,14 +25,14 @@
#
# Pisi should warn the user to update repository.
from spam.scenarioapi.scenario import *
from inary.scenarioapi.scenario import *
WORMUX = "wormux"
let_repo_had(WORMUX)
let_spam_had(WORMUX)
let_inary_had(WORMUX)
def run():
repo_version_bumped(WORMUX)
repo_updated_index()
spam_reinstalled(WORMUX)
inary_reinstalled(WORMUX)
......@@ -12,8 +12,8 @@
# Emniyet mandalı: taban sistem system.base deki bu paketler kaldırılamıyor: hashalot
# Kaldıracak paket yok.
# Program sonlandırıldı.
# spam.operations.Error: Çakışmalar var
# Genel yardım için lütfen 'spam help' komutunu kullanınız.
# inary.operations.Error: Çakışmalar var
# Genel yardım için lütfen 'inary help' komutunu kullanınız.
#
# Problem Description:
#
......@@ -26,7 +26,7 @@
# Pisi should remove the package if answered yes.
#
from spam.scenarioapi.scenario import *
from inary.scenarioapi.scenario import *
HASHALOT="hashalot"
COREUTILS="coreutils"
......@@ -38,11 +38,11 @@ let_repo_had(COREUTILS, with_partof("system.base"))
let_repo_had(GLIBC, with_partof("system.base"))
let_repo_had(UTIL_LINUX, with_partof("system.base"))
let_spam_had(COREUTILS, HASHALOT, GLIBC, UTIL_LINUX)
let_inary_had(COREUTILS, HASHALOT, GLIBC, UTIL_LINUX)
def run():
repo_version_bumped(GLIBC)
repo_version_bumped(UTIL_LINUX)
repo_version_bumped(COREUTILS, with_added_conflicts(HASHALOT))
repo_updated_index()
spam_upgraded()
inary_upgraded()
......@@ -6,7 +6,7 @@
#
# Problem : reverse dependency information disappears
#
# faik@iago scenarios $ spam info kdelibs
# faik@iago scenarios $ inary info kdelibs
# Yüklü paket:
# Ad: kdelibs, versiyon 3.5.4, sürüm 35, inşa 17
# Özet: Tüm KDE programlarının ihtiyaç duyduğu KDE kütüphaneleri
......@@ -29,7 +29,7 @@
# They should not. :)
#
from spam.scenarioapi.scenario import *
from inary.scenarioapi.scenario import *
FLIGHTGEAR = "flightgear"
FLIGHTGEAR_DATA = "flightgear-data"
......@@ -37,11 +37,11 @@ FLIGHTGEAR_DATA = "flightgear-data"
let_repo_had(FLIGHTGEAR, with_dependencies(FLIGHTGEAR_DATA))
let_repo_had(FLIGHTGEAR_DATA)
let_spam_had(FLIGHTGEAR, FLIGHTGEAR_DATA)
let_inary_had(FLIGHTGEAR, FLIGHTGEAR_DATA)
def run():
spam_info(FLIGHTGEAR_DATA)
inary_info(FLIGHTGEAR_DATA)
repo_version_bumped(FLIGHTGEAR_DATA)
repo_updated_index()
spam_upgraded()
spam_info(FLIGHTGEAR_DATA)
inary_upgraded()
inary_info(FLIGHTGEAR_DATA)
......@@ -21,7 +21,7 @@
# SPaM should not remove the conflicting packages unless fetching of all the new upgrade
# packages has finished.
from spam.scenarioapi.scenario import *
from inary.scenarioapi.scenario import *
XORG = "xorg"
QT = "qt"
......@@ -31,7 +31,7 @@ XORG_FONT = "xorg-font"
let_repo_had(XORG)
let_repo_had(QT, with_dependencies(XORG))
let_spam_had(XORG, QT)
let_inary_had(XORG, QT)
def run():
repo_added_package(XORG_VIDEO, with_conflicts(XORG))
......@@ -39,4 +39,4 @@ def run():
repo_added_package(XORG_SERVER, with_conflicts(XORG), with_dependencies(XORG_VIDEO, XORG_FONT))
repo_version_bumped(QT, with_removed_dependencies(XORG), with_added_dependencies(XORG_SERVER))
repo_updated_index()
spam_upgraded()
inary_upgraded()
......@@ -18,7 +18,7 @@
# Versioning info can be defined as in dependency informations.
from spam.scenarioapi.scenario import *
from inary.scenarioapi.scenario import *
LIBMP4V2 = "libmp4v2"
FAAD2 = "faad2"
......@@ -26,10 +26,10 @@ FAAD2 = "faad2"
let_repo_had(LIBMP4V2)
let_repo_had(FAAD2, with_version("0.2.1"))
let_spam_had(LIBMP4V2, FAAD2)
let_inary_had(LIBMP4V2, FAAD2)
def run():
repo_version_bumped(LIBMP4V2, with_added_conflict(FAAD2, versionTo="0.2.1"))
repo_version_bumped(FAAD2, with_version("0.2.5"))
repo_updated_index()
spam_upgraded()
inary_upgraded()
......@@ -10,9 +10,9 @@
# util-macros xorg-proto xtrans libXdmcp libXau libX11 libXext libXp libICE libSM
# libXt libXprintUtil libXxf86vm ncurses less iputils gettext kbd sysvinit
# findutils popt gdbm 915resolution db3 mingetty splash-theme freetype fontconfig
# bzip2 expat zlib openssl python-fchksum db1 readline db4 python comar-api glib2
# bzip2 expat zlib openssl python-fchksum db1 readline db4 python scom-api glib2
# pwdb cracklib pam shadow libperl perl attr acl coreutils debianutils sysklogd
# comar wireless-tools net-tools sed module-init-tools gawk which hdparm libpcre
# scom wireless-tools net-tools sed module-init-tools gawk which hdparm libpcre
# grep tcp-wrappers e2fsprogs util-linux bash baselayout flex unzip libidn cpio
# liblbxutil libdrm dhcpcd libfontenc libXfont libXfontcache libXxf86dga
# libXprintAppUtil libXfixes libXcomposite libXres libXrender libXv libXvMC libdmx
......@@ -21,22 +21,22 @@
# libXScrnSaver xbitmaps libXft libXTrap liboldX xorg-app xorg-data xorg-util
# xorg-input font-util xorg-font zorg jimmac-xcursor xorg-video xorg-server psmisc
# ddcxinfos texinfo groff groff-utf8 man man-pages coolplug mkinitramfs parted
# grub udev libgcc klibc lzma nss-mdns mudur gzip ncompress tar piksemel file
# python-bsddb3 spam nano glibc lib-compat miscfiles libpng jpeg libcap
# grub udev libgcc klibc lzma nss-mdns scomd gzip ncompress tar piksemel file
# python-bsddb3 inary nano glibc lib-compat miscfiles libpng jpeg libcap
# openldap-client bc dmidecode fbgrab splashutils-misc splashutils pyparted
# openssh sysfsutils pcmciautils zip libusb linux-headers memtest86 procps curl
# vixie-cron slang usbutils pciutils
# Paket(ler)in toplam boyu: 65.91 MB
# Bağımlılıklar yüzünden ek paketler var. Devam etmek istiyor musunuz? (evet/hayır)e
# Paket util-macros, buildfarm deposunda bulundu
# util-macros-1.1.2-2-3.spam (5.0 KB)100% 0.00 B/s [??:??:??] [bitti]
# util-macros-1.1.2-2-3.inary (5.0 KB)100% 0.00 B/s [??:??:??] [bitti]
# util-macros paketi, versiyon 1.1.2, sürüm 2, inşa 3 kuruluyor
# util-macros paketinin dosyaları arşivden çıkartılıyor
# util-macros paketi yapılandırılıyor
# util-macros paketi yapılandırıldı
# util-macros paketi kuruldu
# Paket xorg-proto, buildfarm deposunda bulundu
# xorg-proto-7.2_rc1-2-3.spam (190.0 KB)100% 77.64 KB/s [00:00:00] [bitti]
# xorg-proto-7.2_rc1-2-3.inary (190.0 KB)100% 77.64 KB/s [00:00:00] [bitti]
# Klavye kesmesi: Çıkıyor...
#
# Problem Description:
......@@ -49,32 +49,32 @@
# SPaM should update or install system.base packages before any other package on the system.
#
from spam.scenarioapi.scenario import *
from inary.scenarioapi.scenario import *
OPENOFFICE="openoffice"
SUN_JRE="sun-jre"
UTIL_MACROS="util-macros"
XORG_PROTO="xorg-proto"
COMAR="comar"
MUDUR="mudur"
SCOM="scom"
SCOMD="scomd"
let_repo_had(COMAR, with_partof("system.base"))
let_repo_had(MUDUR, with_partof("system.base"))
let_repo_had(SCOM, with_partof("system.base"))
let_repo_had(SCOMD, with_partof("system.base"))
let_repo_had(UTIL_MACROS)
let_repo_had(XORG_PROTO)
let_repo_had(OPENOFFICE, with_dependencies(SUN_JRE))
let_repo_had(SUN_JRE)
let_spam_had(UTIL_MACROS, XORG_PROTO, COMAR, MUDUR, OPENOFFICE, SUN_JRE)
let_inary_had(UTIL_MACROS, XORG_PROTO, SCOM, SCOMD, OPENOFFICE, SUN_JRE)
def run():
repo_version_bumped(SUN_JRE)
repo_version_bumped(OPENOFFICE)
repo_version_bumped(MUDUR)
repo_version_bumped(COMAR)
repo_version_bumped(SCOMD)
repo_version_bumped(SCOM)
repo_version_bumped(XORG_PROTO)
repo_version_bumped(UTIL_MACROS)
repo_updated_index()
spam_upgraded(OPENOFFICE, SUN_JRE)
inary_upgraded(OPENOFFICE, SUN_JRE)
......@@ -16,11 +16,11 @@
# All blacklisted packages should be excluded from upgrade plans.
from spam.scenarioapi.scenario import *
from inary.scenarioapi.scenario import *
DBUS = "dbus"
GRUB = "grub"
SPAM = "spam"
SPAM = "inary"
KERNEL = "kernel"
BLUEZ = "bluez"
......@@ -28,7 +28,7 @@ let_repo_had(KERNEL)
let_repo_had(BLUEZ)
let_repo_had(DBUS, with_partof("system.base"))
let_repo_had(SPAM, with_partof("system.base"))
let_spam_had(DBUS, SPAM, KERNEL, BLUEZ)
let_inary_had(DBUS, SPAM, KERNEL, BLUEZ)
def run():
repo_version_bumped(KERNEL)
......@@ -37,5 +37,5 @@ def run():
repo_version_bumped(SPAM)
repo_updated_index()
# The packages in /etc/spam/blacklist should not be upgraded
spam_upgraded()
# The packages in /etc/inary/blacklist should not be upgraded
inary_upgraded()
......@@ -17,14 +17,14 @@ import shutil
import glob
import sys
from spam.scenarioapi.constants import *
from inary.scenarioapi.constants import *
def clean_out():
for x in glob.glob(consts.repo_path + consts.glob_spams):
for x in glob.glob(consts.repo_path + consts.glob_inarys):
os.unlink(x)
if os.path.exists(consts.spam_db):
shutil.rmtree(consts.spam_db)
if os.path.exists(consts.inary_db):
shutil.rmtree(consts.inary_db)
def run_scen(scenario):
scenario()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment