Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=a1896c90a79d476d7c406f3b9e6063a7a4331a9a
commit a1896c90a79d476d7c406f3b9e6063a7a4331a9a
Author: Michel Hermier <herm...@frugalware.org>
Date: Fri May 2 14:25:36 2014 +0200
libpacman: Remove all PM_PKG_STICK usage outside of package.cpp and pacman.cpp.
diff --git a/lib/libpacman/db/localdb_files.cpp
b/lib/libpacman/db/localdb_files.cpp
index 14d7752..c5ddca4 100644
--- a/lib/libpacman/db/localdb_files.cpp
+++ b/lib/libpacman/db/localdb_files.cpp
@@ -173,7 +173,7 @@ int _pacman_localdb_desc_fread(Package *info, FILE *fp)
} else if(!strcmp(line, "%STICK%")) {
/* STICK tag only appears in sync repositories,
* not the local one. */
- info->stick = 1;
+ info->m_stick = 1;
}
}
info->flags |= PM_LOCALPACKAGE_FLAGS_DESC;
@@ -212,7 +212,7 @@ int _pacman_localdb_depends_fread(Package *info, FILE *fp)
} else if(!strcmp(line, "%STICK%")) {
/* STICK tag only appears in sync repositories,
* not the local one. */
- info->stick = 1;
+ info->m_stick = 1;
}
}
info->flags |= PM_LOCALPACKAGE_FLAGS_DEPENDS;
diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp
index 2ac65c7..bfc2eaf 100644
--- a/lib/libpacman/package.cpp
+++ b/lib/libpacman/package.cpp
@@ -81,7 +81,7 @@ Package::Package(const libpacman::Package &other)
size = other.size;
usize = other.usize;
m_force = other.m_force;
- stick = other.stick;
+ m_stick = other.m_stick;
scriptlet = other.scriptlet;
m_reason = other.m_reason;
license = _pacman_list_strdup(other.license);
@@ -410,7 +410,7 @@ void *Package::getinfo(unsigned char parm)
case PM_PKG_LICENSE: data = license; break;
case PM_PKG_REPLACES: data = m_replaces; break;
case PM_PKG_FORCE: data = (void *)(long)m_force; break;
- case PM_PKG_STICK: data = (void *)(long)stick; break;
+ case PM_PKG_STICK: data = (void *)(long)m_stick; break;
case PM_PKG_MD5SUM: data = md5sum; break;
case PM_PKG_SHA1SUM: data = sha1sum; break;
case PM_PKG_DEPENDS: data = m_depends; break;
diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h
index 0f9a3eb..1b294ba 100644
--- a/lib/libpacman/package.h
+++ b/lib/libpacman/package.h
@@ -139,7 +139,7 @@ public:
unsigned long usize;
unsigned char scriptlet;
unsigned char m_force;
- unsigned char stick;
+ unsigned char m_stick;
time_t date;
unsigned char m_reason;
FStringList *desc_localized;
diff --git a/lib/libpacman/package_properties.h
b/lib/libpacman/package_properties.h
index 006b5d0..791f7f6 100644
--- a/lib/libpacman/package_properties.h
+++ b/lib/libpacman/package_properties.h
@@ -28,5 +28,6 @@ LIBPACMAN_PACKAGE_PROPERTY(FStringList *, provides,
PROVIDES )
LIBPACMAN_PACKAGE_PROPERTY(unsigned char, reason, REASON )
LIBPACMAN_PACKAGE_PROPERTY(FStringList *, replaces, REPLACES )
LIBPACMAN_PACKAGE_PROPERTY(FStringList *, requiredby, REQUIREDBY)
+LIBPACMAN_PACKAGE_PROPERTY(unsigned char, stick, STICK )
LIBPACMAN_PACKAGE_PROPERTY(const char *, version, VERSION )
diff --git a/lib/libpacman/trans_sysupgrade.cpp
b/lib/libpacman/trans_sysupgrade.cpp
index 7669c08..d205469 100644
--- a/lib/libpacman/trans_sysupgrade.cpp
+++ b/lib/libpacman/trans_sysupgrade.cpp
@@ -188,7 +188,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans)
/* package too new (UpgradeDelay) */
_pacman_log(PM_LOG_FLOW1, _("%s-%s: delaying upgrade of package (%s)\n"),
local->name(), local->version(), spkg->version());
- } else if(spkg->getinfo(PM_PKG_STICK)) {
+ } else if(spkg->stick()) {
_pacman_log(PM_LOG_WARNING, _("%s-%s: please upgrade manually (%s => %s)"),
local->name(), local->version(), local->version(), spkg->version());
} else {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
