# - on demand loading of secondary repository data
# - checksum verification
# - deltarpm support
+# - installation of commandline packages
#
# things not yet ported:
-# - installation of commandline packages
# - gpg verification
# - file conflicts
# - fastestmirror implementation
#import gc
#gc.set_debug(gc.DEBUG_LEAK)
-def calc_checksum_stat(stat, type=solv.REPOKEY_TYPE_SHA256):
- chksum = solv.Chksum(type)
+def calc_cookie_stat(stat):
+ chksum = solv.Chksum(solv.REPOKEY_TYPE_SHA256)
chksum.add("1.1")
chksum.add(str(stat[ST_DEV]))
chksum.add(str(stat[ST_INO]))
chksum.add(str(stat[ST_MTIME]))
return chksum.raw()
-def calc_checksum_fp(fp, type=solv.REPOKEY_TYPE_SHA256):
- chksum = solv.Chksum(type)
- chksum.addfp(fp)
+def calc_cookie_fp(fp):
+ chksum = solv.Chksum(solv.REPOKEY_TYPE_SHA256)
+ chksum.add_fp(fp)
return chksum.raw()
def calccachepath(repo, repoext = None):
if repo['alias'] != '@System' and not repoext:
if 'extcookie' not in repo:
# create unique id
- extcookie = calc_checksum_stat(os.fstat(f.fileno()))
+ extcookie = calc_cookie_stat(os.fstat(f.fileno()))
extcookie = ''.join(chr(ord(s)^ord(c)) for s,c in zip(extcookie, repo['cookie']))
if ord(extcookie[0]) == 0:
extcookie[0] = chr(1)
if tmpname:
os.unlink(tmpname)
-def curlfopen(repo, file, uncompress, chksum, chksumtype, badchecksum=None):
+def curlfopen(repo, file, uncompress, chksum, badchecksum=None):
baseurl = repo['baseurl']
url = re.sub(r'/$', '', baseurl) + '/' + file
f = tempfile.TemporaryFile()
st = subprocess.call(['curl', '-f', '-s', '-L', url], stdout=f.fileno())
- if os.lseek(f.fileno(), 0, os.SEEK_CUR) == 0 and (st == 0 or not chksumtype):
+ if os.lseek(f.fileno(), 0, os.SEEK_CUR) == 0 and (st == 0 or not chksum):
return None
os.lseek(f.fileno(), 0, os.SEEK_SET)
if st:
if badchecksum:
badchecksum['True'] = 'True'
return None
- if chksumtype:
- fchksum = solv.Chksum(chksumtype)
+ if chksum:
+ fchksum = solv.Chksum(chksum.type)
if not fchksum:
print "%s: unknown checksum type" % file
if badchecksum:
badchecksum['True'] = 'True'
return None
- fchksum.addfd(f.fileno())
+ fchksum.add_fd(f.fileno())
if not fchksum.matches(chksum):
print "%s: checksum mismatch" % file
if badchecksum:
for d in di:
d.setpos_parent()
filename = d.pool.lookup_str(solv.SOLVID_POS, solv.REPOSITORY_REPOMD_LOCATION)
- chksum, chksumtype = d.pool.lookup_bin_checksum(solv.SOLVID_POS, solv.REPOSITORY_REPOMD_CHECKSUM)
- if filename and not chksumtype:
+ chksum = d.pool.lookup_checksum(solv.SOLVID_POS, solv.REPOSITORY_REPOMD_CHECKSUM)
+ if filename and not chksum:
print "no %s file checksum!" % filename
filename = None
chksum = None
if filename:
- return (filename, chksum, chksumtype)
- return (None, None, None)
+ return (filename, chksum)
+ return (None, None)
def repomd_add_ext(repo, repodata, what, ext):
- filename, chksum, chksumtype = repomd_find(repo, what)
+ filename, chksum = repomd_find(repo, what)
if not filename:
return False
if what == 'prestodelta':
handle = repodata.new_handle()
repodata.set_poolstr(handle, solv.REPOSITORY_REPOMD_TYPE, what)
repodata.set_str(handle, solv.REPOSITORY_REPOMD_LOCATION, filename)
- repodata.set_bin_checksum(handle, solv.REPOSITORY_REPOMD_CHECKSUM, chksumtype, chksum)
+ repodata.set_bin_checksum(handle, solv.REPOSITORY_REPOMD_CHECKSUM, chksum)
if what == 'deltainfo':
repodata.add_idarray(handle, solv.REPOSITORY_KEYS, solv.REPOSITORY_DELTAINFO)
repodata.add_idarray(handle, solv.REPOSITORY_KEYS, solv.REPOKEY_TYPE_FLEXARRAY)
sys.stdout.write(" fetching]\n")
sys.stdout.flush()
filename = repodata.lookup_str(solv.SOLVID_META, solv.REPOSITORY_REPOMD_LOCATION)
- filechksum, filechksumtype = repodata.lookup_bin_checksum(solv.SOLVID_META, solv.REPOSITORY_REPOMD_CHECKSUM)
- f = curlfopen(repo, filename, True, filechksum, filechksumtype)
+ filechksum = repodata.lookup_checksum(solv.SOLVID_META, solv.REPOSITORY_REPOMD_CHECKSUM)
+ f = curlfopen(repo, filename, True, filechksum)
if not f:
return False
if ext == 'FL':
di.prepend_keyname(solv.SUSETAGS_FILE)
for d in di:
d.setpos_parent()
- chksum, chksumtype = d.pool.lookup_bin_checksum(solv.SOLVID_POS, solv.SUSETAGS_FILE_CHECKSUM)
- return (what, chksum, chksumtype)
- return (None, None, None)
+ chksum = d.pool.lookup_checksum(solv.SOLVID_POS, solv.SUSETAGS_FILE_CHECKSUM)
+ return (what, chksum)
+ return (None, None)
def susetags_add_ext(repo, repodata, what, ext):
- (filename, chksum, chksumtype) = susetags_find(repo, what)
+ (filename, chksum) = susetags_find(repo, what)
if not filename:
return False
handle = repodata.new_handle()
repodata.set_str(handle, solv.SUSETAGS_FILE_NAME, filename)
- if chksumtype:
- repodata.set_bin_checksum(handle, solv.SUSETAGS_FILE_CHECKSUM, chksumtype, chksum)
+ if chksum:
+ repodata.set_bin_checksum(handle, solv.SUSETAGS_FILE_CHECKSUM, chksum)
if ext == 'DU':
repodata.add_idarray(handle, solv.REPOSITORY_KEYS, solv.SOLVABLE_DISKUSAGE)
repodata.add_idarray(handle, solv.REPOSITORY_KEYS, solv.REPOKEY_TYPE_DIRNUMNUMARRAY)
descrdir = repo['handle'].lookup_str(solv.SOLVID_META, solv.SUSETAGS_DESCRDIR)
if not descrdir:
descrdir = "suse/setup/descr"
- filechksum, filechksumtype = repodata.lookup_bin_checksum(solv.SOLVID_META, solv.SUSETAGS_FILE_CHECKSUM)
- f = curlfopen(repo, descrdir + '/' + filename, True, filechksum, filechksumtype)
+ filechksum = repodata.lookup_checksum(solv.SOLVID_META, solv.SUSETAGS_FILE_CHECKSUM)
+ f = curlfopen(repo, descrdir + '/' + filename, True, filechksum)
if not f:
return False
repo['handle'].add_susetags(f, defvendorid, None, Repo.REPO_USE_LOADING|Repo.REPO_EXTEND_SOLVABLES)
addedprovidesset = set(addedprovides)
for repohandle in pool.repos:
repo = repohandle.appdata
+ if 'cookie' not in repo: # ignore commandlinerepo
+ continue
if not repohandle.nsolvables:
continue
# make sure there's just one real repodata with extensions
sysrepo['handle'].appdata = sysrepo
pool.installed = sysrepo['handle']
sysrepostat = os.stat("/var/lib/rpm/Packages")
-sysrepocookie = calc_checksum_stat(sysrepostat)
+sysrepocookie = calc_cookie_stat(sysrepostat)
sysrepo['cookie'] = sysrepocookie
if usecachedrepo(sysrepo, None):
print "cached"
repo['handle'].free(True)
del repo['handle']
continue
- repo['cookie'] = calc_checksum_fp(f)
+ repo['cookie'] = calc_cookie_fp(f)
if usecachedrepo(repo, None, True):
print "cached"
solv.xfclose(f)
repo['handle'].add_repomdxml(f, 0)
solv.xfclose(f)
print "fetching"
- (filename, filechksum, filechksumtype) = repomd_find(repo, 'primary')
+ (filename, filechksum) = repomd_find(repo, 'primary')
if filename:
- f = curlfopen(repo, filename, True, filechksum, filechksumtype, badchecksum)
+ f = curlfopen(repo, filename, True, filechksum, badchecksum)
if f:
repo['handle'].add_rpmmd(f, None, 0)
solv.xfclose(f)
if badchecksum:
continue # hopeless, need good primary
- (filename, filechksum, filechksumtype) = repomd_find(repo, 'updateinfo')
+ (filename, filechksum) = repomd_find(repo, 'updateinfo')
if filename:
- f = curlfopen(repo, filename, True, filechksum, filechksumtype, badchecksum)
+ f = curlfopen(repo, filename, True, filechksum, badchecksum)
if f:
repo['handle'].add_updateinfoxml(f, 0)
solv.xfclose(f)
repo['handle'].free(True)
del repo['handle']
continue
- repo['cookie'] = calc_checksum_fp(f)
+ repo['cookie'] = calc_cookie_fp(f)
if usecachedrepo(repo, None, True):
print "cached"
solv.xfclose(f)
descrdir = repo['handle'].lookup_str(solv.SOLVID_META, solv.SUSETAGS_DESCRDIR)
if not descrdir:
descrdir = "suse/setup/descr"
- (filename, filechksum, filechksumtype) = susetags_find(repo, 'packages.gz')
+ (filename, filechksum) = susetags_find(repo, 'packages.gz')
if not filename:
- (filename, filechksum, filechksumtype) = susetags_find(repo, 'packages')
+ (filename, filechksum) = susetags_find(repo, 'packages')
if filename:
- f = curlfopen(repo, descrdir + '/' + filename, True, filechksum, filechksumtype, badchecksum)
+ f = curlfopen(repo, descrdir + '/' + filename, True, filechksum, badchecksum)
if f:
repo['handle'].add_susetags(f, defvendorid, None, Repo.REPO_NO_INTERNALIZE|Repo.SUSETAGS_RECORD_SHARES)
solv.xfclose(f)
- (filename, filechksum, filechksumtype) = susetags_find(repo, 'packages.en.gz')
+ (filename, filechksum) = susetags_find(repo, 'packages.en.gz')
if not filename:
- (filename, filechksum, filechksumtype) = susetags_find(repo, 'packages.en')
+ (filename, filechksum) = susetags_find(repo, 'packages.en')
if filename:
- f = curlfopen(repo, descrdir + '/' + filename, True, filechksum, filechksumtype, badchecksum)
+ f = curlfopen(repo, descrdir + '/' + filename, True, filechksum, badchecksum)
if f:
repo['handle'].add_susetags(f, defvendorid, None, Repo.REPO_NO_INTERNALIZE|Repo.REPO_REUSE_REPODATA|Repo.REPO_EXTEND_SOLVABLES)
solv.xfclose(f)
print " - %s [%s]: %s" % (pool.solvid2str(solvid), pool.solvables[solvid].repo.name, pool.lookup_str(solvid, solv.SOLVABLE_SUMMARY))
sys.exit(0)
-# XXX: insert rewrite_repos function
+cmdlinerepo = None
+cmdlinepkgs = {}
+if cmd == 'li' or cmd == 'list' or cmd == 'info' or cmd == 'in' or cmd == 'install':
+ for arg in args:
+ if arg.endswith(".rpm") and os.access(arg, os.R_OK):
+ if not cmdlinerepo:
+ cmdlinerepo = { 'alias': '@commandline' }
+ cmdlinerepo['handle'] = pool.add_repo(cmdlinerepo['alias'])
+ cmdlinerepo['handle'].appdata = cmdlinerepo
+ cmdlinepkgs[arg] = cmdlinerepo['handle'].add_rpm(arg, Repo.REPO_REUSE_REPODATA|Repo.REPO_NO_INTERNALIZE)
+ if cmdlinerepo:
+ cmdlinerepo['handle'].internalize()
addedprovides = pool.addfileprovides_ids()
if addedprovides:
jobs = []
for arg in args:
+ if cmdlinerepo and arg in cmdlinepkgs:
+ jobs.append(pool.Job(Job.SOLVER_SOLVABLE, cmdlinepkgs[arg]))
+ continue
argjob = mkjobs(pool, cmd, arg)
jobs += argjob
job.how |= Job.SOLVER_ERASE
#pool.set_debuglevel(2)
- solver = pool.create_solver()
- solver.ignorealreadyrecommended = True
- problems = solver.solve(jobs)
- if problems:
+ solver = None
+ while True:
+ solver = pool.create_solver()
+ solver.ignorealreadyrecommended = True
+ if cmd == 'rm' or cmd == 'erase':
+ solver.allowuninstall = True
+ problems = solver.solve(jobs)
+ if not problems:
+ break
for problem in problems:
print "Problem %d:" % problem.id
r = problem.findproblemrule()
print " - allow replacement of %s with %s" % (element.solvable.str(), element.replacement.str())
elif etype == Solver.SOLVER_SOLUTION_DEINSTALL:
print " - allow deinstallation of %s" % element.solvable.str()
- sys.exit(1)
+ sol = ''
+ while not (sol == 's' or sol == 'q' or (sol.isdigit() and int(sol) >= 1 and int(sol) <= len(solutions))):
+ sys.stdout.write("Please choose a solution: ")
+ sys.stdout.flush()
+ sol = sys.stdin.readline().strip()
+ if sol == 's':
+ continue # skip problem
+ if sol == 'q':
+ sys.exit(1)
+ solution = solutions[int(sol) - 1]
+ for element in solution.elements():
+ etype = element.type
+ newjob = None
+ if etype == Solver.SOLVER_SOLUTION_JOB:
+ jobs[element.jobidx] = pool.Job(Job.SOLVER_NOOP, 0)
+ elif etype == Solver.SOLVER_SOLUTION_INFARCH or etype == Solver.SOLVER_SOLUTION_DISTUPGRADE:
+ newjob = pool.Job(Job.SOLVER_INSTALL|Job.SOLVER_SOLVABLE, element.solvable.id)
+ elif etype == Solver.SOLVER_SOLUTION_REPLACE:
+ newjob = pool.Job(Job.SOLVER_INSTALL|Job.SOLVER_SOLVABLE, element.replacement.id)
+ elif etype == Solver.SOLVER_SOLUTION_DEINSTALL:
+ newjob = pool.Job(Job.SOLVER_ERASE|Job.SOLVER_SOLVABLE, element.solvable.id)
+ if newjob:
+ for job in jobs:
+ if job.how == newjob.how and job.what == newjob.what:
+ newjob = None
+ break
+ if newjob:
+ jobs.append(newjob)
# no problems, show transaction
trans = solver.transaction()
del solver
location, medianr = p.lookup_location()
if not location:
continue
+ if repo == cmdlinerepo:
+ f = solv.xfopen(location)
+ if not f:
+ sys.exit("\n%s: %s not found" % location)
+ newpkgsfp[p.id] = f
+ continue
if sysrepo['handle'].nsolvables and os.access('/usr/bin/applydeltarpm', os.X_OK):
pname = p.name
di = p.repo.dataiterator_new(solv.SOLVID_META, solv.DELTA_PACKAGE_NAME, pname, Dataiterator.SEARCH_STRING)
st = subprocess.call(['/usr/bin/applydeltarpm', '-a', p.arch, '-c', '-s', seq])
if st:
continue
- chksum, chksumtype = pool.lookup_bin_checksum(solv.SOLVID_POS, solv.DELTA_CHECKSUM)
+ chksum = pool.lookup_checksum(solv.SOLVID_POS, solv.DELTA_CHECKSUM)
if not chksum:
continue
dloc = pool.lookup_str(solv.SOLVID_POS, solv.DELTA_LOCATION_DIR) + '/' + pool.lookup_str(solv.SOLVID_POS, solv.DELTA_LOCATION_NAME) + '-' + pool.lookup_str(solv.SOLVID_POS, solv.DELTA_LOCATION_EVR) + '.' + pool.lookup_str(solv.SOLVID_POS, solv.DELTA_LOCATION_SUFFIX)
- f = curlfopen(repo, dloc, False, chksum, chksumtype)
+ f = curlfopen(repo, dloc, False, chksum)
if not f:
continue
nf = tempfile.TemporaryFile()
sys.stdout.flush()
continue
- chksum, chksumtype = p.lookup_bin_checksum(solv.SOLVABLE_CHECKSUM)
- f = curlfopen(repo, location, False, chksum, chksumtype)
+ if repo['type'] == 'yast2':
+ datadir = repo['handle'].lookup_str(solv.SOLVID_META, solv.SUSETAGS_DATADIR)
+ if not datadir:
+ datadir = 'suse'
+ location = datadir + '/' + location
+ chksum = p.lookup_checksum(solv.SOLVABLE_CHECKSUM)
+ f = curlfopen(repo, location, False, chksum)
if not f:
sys.exit("\n%s: %s not found in repository" % (repo['alias'], location))
newpkgsfp[p.id] = f
print "Committing transaction:"
print
ts = rpm.TransactionSet('/')
+ ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
erasenamehelper = {}
for p in trans.steps():
type = trans.steptype(p, Transaction.SOLVER_TRANSACTION_RPM_ONLY)
verify_checksum(int fd, const char *file, const unsigned char *chksum, Id chksumtype)
{
char buf[1024];
- unsigned char *sum;
+ const unsigned char *sum;
void *h;
int l;
int
repomd_add_ext(Repo *repo, Repodata *data, const char *what)
{
- Pool *pool = repo->pool;
- Dataiterator di;
Id chksumtype, handle;
const unsigned char *chksum;
const char *filename;
- dataiterator_init(&di, pool, repo, SOLVID_META, REPOSITORY_REPOMD_TYPE, what, SEARCH_STRING);
- dataiterator_prepend_keyname(&di, REPOSITORY_REPOMD);
- if (!dataiterator_step(&di))
- {
- dataiterator_free(&di);
- return 0;
- }
+ filename = repomd_find(repo, what, &chksum, &chksumtype);
+ if (!filename)
+ return 0;
if (!strcmp(what, "prestodelta"))
what = "deltainfo";
- dataiterator_setpos_parent(&di);
- filename = pool_lookup_str(pool, SOLVID_POS, REPOSITORY_REPOMD_LOCATION);
- chksum = pool_lookup_bin_checksum(pool, SOLVID_POS, REPOSITORY_REPOMD_CHECKSUM, &chksumtype);
- if (!filename || !chksum)
- {
- dataiterator_free(&di);
- return 0;
- }
handle = repodata_new_handle(data);
repodata_set_poolstr(data, handle, REPOSITORY_REPOMD_TYPE, what);
repodata_set_str(data, handle, REPOSITORY_REPOMD_LOCATION, filename);
- if (chksumtype)
- repodata_set_bin_checksum(data, handle, REPOSITORY_REPOMD_CHECKSUM, chksumtype, chksum);
+ repodata_set_bin_checksum(data, handle, REPOSITORY_REPOMD_CHECKSUM, chksumtype, chksum);
if (!strcmp(what, "deltainfo"))
{
repodata_add_idarray(data, handle, REPOSITORY_KEYS, REPOSITORY_DELTAINFO);
repodata_add_idarray(data, handle, REPOSITORY_KEYS, SOLVABLE_FILELIST);
repodata_add_idarray(data, handle, REPOSITORY_KEYS, REPOKEY_TYPE_DIRSTRARRAY);
}
- dataiterator_free(&di);
repodata_add_flexarray(data, SOLVID_META, REPOSITORY_EXTERNAL, handle);
return 1;
}
if (!commandlinerepo)
commandlinerepo = repo_create(pool, "@commandline");
#ifndef DEBIAN
- repo_add_rpms(commandlinerepo, (const char **)argv + i, 1, REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE);
+ p = repo_add_rpm(commandlinerepo, (const char *)argv[i], REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE);
#else
- repo_add_debs(commandlinerepo, (const char **)argv + i, 1, REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE);
+ p = repo_add_deb(commandlinerepo, (const char *)argv[i], REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE);
#endif
- commandlinepkgs[i] = commandlinerepo->end - 1;
+ commandlinepkgs[i] = p;
}
if (commandlinerepo)
repo_internalize(commandlinerepo);
// FOR_REPOS(i, repo)
// printf("%s: %d solvables\n", repo->name, repo->nsolvables);
addedfileprovides = 0;
- pool_addfileprovides_ids(pool, 0, &addedfileprovides);
+ pool_addfileprovides_ids(pool, pool->installed, &addedfileprovides);
if (addedfileprovides && *addedfileprovides)
rewrite_repos(pool, addedfileprovides);
sat_free(addedfileprovides);
%module solv
-%typemap(in) (Id *idarray, int idarraylen) {
- /* Check if is a list */
- if (PyList_Check($input)) {
- int size = PyList_Size($input);
- int i = 0;
- $1 = (Id *)sat_malloc2(size, sizeof(Id));
- for (i = 0; i < size; i++) {
- PyObject *o = PyList_GetItem($input,i);
- int v;
- int e = SWIG_AsVal_int(o, &v);
- if (!SWIG_IsOK(e)) {
- SWIG_exception_fail(SWIG_ArgError(e), "list must contain integers");
- sat_free($1);
- return NULL;
- }
- $1[i] = v;
- }
- $2 = size;
- } else {
- PyErr_SetString(PyExc_TypeError,"not a list");
- return NULL;
- }
-}
-%typemap(freearg) (Id *idarray, int idarraylen) {
- sat_free($1);
-}
-
%typemap(in) Queue {
/* Check if is a list */
queue_init(&$1);
bool allowvendorchange;
} Solver;
-typedef struct chksum {} Chksum;
+typedef struct chksum {
+} Chksum;
%rename(xfopen) sat_xfopen;
%rename(xfopen_fd) sat_xfopen_fd;
~Chksum() {
sat_chksum_free($self, 0);
}
+ Id const type;
+ %{
+ SWIGINTERN Id Chksum_type_get(Chksum *chksum) {
+ return sat_chksum_get_type(chksum);
+ }
+ %}
void add(const char *str) {
sat_chksum_add($self, str, strlen((char *)str));
}
- void addfp(FILE *fp) {
+ void add_fp(FILE *fp) {
char buf[4096];
int l;
while ((l = fread(buf, 1, sizeof(buf), fp)) > 0)
sat_chksum_add($self, buf, l);
rewind(fp); /* convenience */
}
- void addfd(int fd) {
+ void add_fd(int fd) {
char buf[4096];
int l;
while ((l = read(fd, buf, sizeof(buf))) > 0)
sat_chksum_add($self, buf, l);
lseek(fd, 0, 0); /* convenience */
}
- bool matches(char *othersum) {
+ bool matches(Chksum *othersum) {
int l;
- unsigned char *b;
+ const unsigned char *b, *bo;
+ if (!othersum)
+ return 0;
+ if (sat_chksum_get_type($self) != sat_chksum_get_type(othersum))
+ return 0;
b = sat_chksum_get($self, &l);
- return memcmp(b, (void *)othersum, l) == 0;
+ bo = sat_chksum_get(othersum, 0);
+ return memcmp(b, bo, l) == 0;
}
SWIGCDATA raw() {
int l;
- unsigned char *b;
+ const unsigned char *b;
b = sat_chksum_get($self, &l);
return cdata_void((void *)b, l);
}
+ %newobject hex;
+ char *hex() {
+ int i, l, c;
+ const unsigned char *b;
+ char *ret, *rp;
+
+ b = sat_chksum_get($self, &l);
+ ret = rp = sat_malloc(2 * l + 1);
+ for (i = 0; i < l; i++)
+ {
+ c = b[i] >> 4;
+ *rp++ = c < 10 ? c + '0' : c + ('a' - 10);
+ c = b[i] & 15;
+ *rp++ = c < 10 ? c + '0' : c + ('a' - 10);
+ }
+ *rp++ = 0;
+ return ret;
+ }
}
bool lookup_void(Id entry, Id keyname) {
return pool_lookup_void($self, entry, keyname);
}
- SWIGCDATA lookup_bin_checksum(Id entry, Id keyname, Id *OUTPUT) {
- int l;
- const unsigned char *b;
- *OUTPUT = 0;
- b = pool_lookup_bin_checksum($self, entry, keyname, OUTPUT);
- if (!b)
- return cdata_void(0, 0);
- return cdata_void((char *)b, sat_chksum_len(*OUTPUT));
- }
- const char *lookup_checksum(Id entry, Id keyname, Id *OUTPUT) {
+ %newobject lookup_checksum;
+ Chksum *lookup_checksum(Id entry, Id keyname) {
Id type = 0;
- *OUTPUT = 0;
- const char *b = pool_lookup_checksum($self, entry, keyname, OUTPUT);
- return b;
+ const unsigned char *b = pool_lookup_bin_checksum($self, entry, keyname, &type);
+ return sat_chksum_create_from_bin(type, b);
}
%newobject dataiterator_new;
Dataiterator *dataiterator_new(Id p, Id key, const char *match, int flags) {
repo_add_rpmdb($self, ref, 0, flags);
return 1;
}
+ Id add_rpm(const char *name, int flags = 0) {
+ int oldend = $self->end;
+ repo_add_rpms($self, &name, 1, flags);
+ if (oldend == $self->end)
+ return 0;
+ return $self->end - 1;
+ }
bool add_susetags(FILE *fp, Id defvendor, const char *language, int flags = 0) {
repo_add_susetags($self, fp, defvendor, language, flags);
return 1;
bool lookup_void(Id keyname) {
return pool_lookup_void($self->pool, $self->id, keyname);
}
- SWIGCDATA lookup_bin_checksum(Id keyname, Id *OUTPUT) {
- int l;
- const unsigned char *b;
- *OUTPUT = 0;
- b = pool_lookup_bin_checksum($self->pool, $self->id, keyname, OUTPUT);
- if (!b)
- return cdata_void(0, 0);
- return cdata_void((char *)b, sat_chksum_len(*OUTPUT));
- }
- const char *lookup_checksum(Id keyname, Id *OUTPUT) {
+ %newobject lookup_checksum;
+ Chksum *lookup_checksum(Id keyname) {
Id type = 0;
- *OUTPUT = 0;
- const char *b = pool_lookup_checksum($self->pool, $self->id, keyname, OUTPUT);
- return b;
+ const unsigned char *b = pool_lookup_bin_checksum($self->pool, $self->id, keyname, &type);
+ return sat_chksum_create_from_bin(type, b);
}
const char *lookup_location(int *OUTPUT) {
return solvable_get_location($self->pool->solvables + $self->id, OUTPUT);
void add_flexarray(Id solvid, Id keyname, Id handle) {
repodata_add_flexarray($self->repo->repodata + $self->id, solvid, keyname, handle);
}
- void set_bin_checksum(Id solvid, Id keyname, Id chksumtype, const char *chksum) {
- repodata_set_bin_checksum($self->repo->repodata + $self->id, solvid, keyname, chksumtype, (const unsigned char *)chksum);
+ void set_bin_checksum(Id solvid, Id keyname, Chksum *chksum) {
+ const unsigned char *buf = sat_chksum_get(chksum, 0);
+ if (buf)
+ repodata_set_bin_checksum($self->repo->repodata + $self->id, solvid, keyname, sat_chksum_get_type(chksum), buf);
}
const char *lookup_str(Id solvid, Id keyname) {
return repodata_lookup_str($self->repo->repodata + $self->id, solvid, keyname);
repodata_lookup_idarray($self->repo->repodata + $self->id, solvid, keyname, &r);
return r;
}
- SWIGCDATA lookup_bin_checksum(Id solvid, Id keyname, Id *OUTPUT) {
- const unsigned char *b;
- *OUTPUT = 0;
- b = repodata_lookup_bin_checksum($self->repo->repodata + $self->id, solvid, keyname, OUTPUT);
- return cdata_void((char *)b, sat_chksum_len(*OUTPUT));
+ %newobject lookup_checksum;
+ Chksum *lookup_checksum(Id solvid, Id keyname) {
+ Id type = 0;
+ const unsigned char *b = repodata_lookup_bin_checksum($self->repo->repodata + $self->id, solvid, keyname, &type);
+ return sat_chksum_create_from_bin(type, b);
}
void internalize() {
repodata_internalize($self->repo->repodata + $self->id);
projects / platform / upstream / libsolv.git / commitdiff